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.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.374 by root, Fri Oct 2 19:55:59 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
111#endif 64#endif
112 65
113#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
127#else 80#else
128# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
130#endif 83#endif
131 84
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
133 86
134#if __GNUC__ >= 3 87#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 90# define INLINE static inline
138#else 91#else
139# define attribute(x) 92# define attribute(x)
140# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
141# define INLINE static 94# define INLINE static
… …
153# if CORO_PTHREAD 106# if CORO_PTHREAD
154static void *coro_thx; 107static void *coro_thx;
155# endif 108# endif
156#endif 109#endif
157 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
158static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
159 123
160/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
163 127
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 131static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 132static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 133static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 134static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 135
136static AV *av_destroy; /* destruction queue */
137static SV *sv_manager; /* the manager coro */
138static SV *sv_idle; /* $Coro::idle */
139
172static GV *irsgv; /* $/ */ 140static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 141static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 142static SV *rv_diehook;
175static SV *rv_warnhook; 143static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 144static HV *hv_sig; /* %SIG */
177 145
178/* async_pool helper stuff */ 146/* async_pool helper stuff */
179static SV *sv_pool_rss; 147static SV *sv_pool_rss;
180static SV *sv_pool_size; 148static SV *sv_pool_size;
149static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 150static AV *av_async_pool; /* idle pool */
151static SV *sv_Coro; /* class string */
152static CV *cv_pool_handler;
182 153
183/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
184static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
185 162
186static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
188 165
189enum { 166enum {
… …
215 int valgrind_id; 192 int valgrind_id;
216#endif 193#endif
217 unsigned char flags; 194 unsigned char flags;
218} coro_cctx; 195} coro_cctx;
219 196
197coro_cctx *cctx_current; /* the currently running cctx */
198
199/*****************************************************************************/
200
220enum { 201enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 207};
226 208
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 210typedef struct
229{ 211{
230 SV *defsv; 212 SV *defsv;
231 AV *defav; 213 AV *defav;
232 SV *errsv; 214 SV *errsv;
233 SV *irsgv; 215 SV *irsgv;
216 HV *hinthv;
234#define VAR(name,type) type name; 217#define VAR(name,type) type name;
235# include "state.h" 218# include "state.h"
236#undef VAR 219#undef VAR
237} perl_slots; 220} perl_slots;
238 221
… …
240 223
241/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
242struct coro { 225struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 227 coro_cctx *cctx;
228
229 /* ready queue */
230 struct coro *next_ready;
245 231
246 /* state data */ 232 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 234 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
… …
263 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 250 SV *rouse_cb;
265 251
266 /* async_pool */ 252 /* async_pool */
267 SV *saved_deffh; 253 SV *saved_deffh;
254 SV *invoke_cb;
255 AV *invoke_av;
256
257 /* on_enter/on_leave */
258 AV *on_enter;
259 AV *on_leave;
260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
268 266
269 /* linked list */ 267 /* linked list */
270 struct coro *next, *prev; 268 struct coro *next, *prev;
271}; 269};
272 270
… …
278/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
280 278
281/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
282 280
283#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
289 287
290/* for Coro.pm */ 288/* for Coro.pm */
291static SV *coro_current; 289static SV *coro_current;
292static SV *coro_readyhook; 290static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 293static struct coro *coro_first;
295#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
296 315
297/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
298 317
299static SV * 318static SV *
300coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
324 get_hv (name, create); 343 get_hv (name, create);
325#endif 344#endif
326 return get_hv (name, create); 345 return get_hv (name, create);
327} 346}
328 347
329/* may croak */ 348INLINE void
330INLINE CV * 349coro_times_update ()
331coro_sv_2cv (SV *sv)
332{ 350{
351#ifdef coro_clock_gettime
352 struct timespec ts;
353
354 ts.tv_sec = ts.tv_nsec = 0;
355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
357
358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
393}
394
395/*****************************************************************************/
396/* magic glue */
397
398#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext
400
401#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \
404 : mg_find (sv, type))
405
406#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \
409 : 0)
410
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413
414INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro)
416{
333 HV *st; 417 HV *stash;
334 GV *gvp; 418 MAGIC *mg;
335 return sv_2cv (sv, &st, &gvp, 0); 419
420 if (SvROK (coro))
421 coro = SvRV (coro);
422
423 if (expect_false (SvTYPE (coro) != SVt_PVHV))
424 croak ("Coro::State object required");
425
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr;
336} 436}
437
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439
440/* faster than SvSTATE, but expects a coroutine hv */
441#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443
444/*****************************************************************************/
445/* padlist management and caching */
337 446
338static AV * 447static AV *
339coro_clone_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
340{ 449{
341 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 451 AV *newpadlist, *newpad;
343 452
344 newpadlist = newAV (); 453 newpadlist = newAV ();
… …
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 459#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 461 --AvFILLp (padlist);
353 462
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
356 465
357 return newpadlist; 466 return newpadlist;
358} 467}
359 468
360static void 469static void
361free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
362{ 471{
363 /* may be during global destruction */ 472 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
365 { 474 {
366 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
367 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
368 { 478 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
370 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 481 I32 j = AvFILLp (av);
372 SV *sv; 482
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 488 }
379 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
381 } 494 }
382} 495}
383 496
384static int 497static int
385coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
386{ 499{
387 AV *padlist; 500 AV *padlist;
388 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
389 506
390 /* casting is fun. */ 507 /* casting is fun. */
391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
392 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
393 510
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 512
396 return 0; 513 return 0;
397} 514}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 515
402static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 517 0, 0, 0, 0,
404 coro_cv_free 518 coro_cv_free
405}; 519};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 520
450/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
451static void 522static void
452get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
453{ 524{
… …
464 CV *cp = Perl_cv_clone (aTHX_ cv); 535 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 536 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 537 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 538 SvREFCNT_dec (cp);
468#else 539#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 541#endif
471 } 542 }
472} 543}
473 544
474static void 545static void
… …
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 553
483 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
484 555
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
487 558
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 560}
490 561
491/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
615static void
616on_enterleave_call (pTHX_ SV *cb);
492 617
493static void 618static void
494load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
495{ 620{
496 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
497 c->slot = 0; 622 c->slot = 0;
498 623
499 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
500 625
501 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
505 631
506 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 633 # include "state.h"
508 #undef VAR 634 #undef VAR
509 635
… …
523 PUTBACK; 649 PUTBACK;
524 } 650 }
525 651
526 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 653 CORO_THROW = c->except;
654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
663 if (expect_false (c->on_enter))
664 {
665 int i;
666
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 }
670
671 SWAP_SVS (c);
528} 672}
529 673
530static void 674static void
531save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
532{ 676{
677 SWAP_SVS (c);
678
679 if (expect_false (c->on_leave))
680 {
681 int i;
682
683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
693 }
694
533 c->except = CORO_THROW; 695 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
535 697
536 { 698 {
537 dSP; 699 dSP;
… …
550 { 712 {
551 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
552 { 714 {
553 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
554 716
555 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
556 { 718 {
557 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
558 720
559 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
560 { 722 {
561 EXTEND (SP, 3);
562 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
563 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
564 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
565 726
566 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
… …
584 /* we manually unroll here, as usually 2 slots is enough */ 745 /* we manually unroll here, as usually 2 slots is enough */
585 if (SLOT_COUNT >= 1) CXINC; 746 if (SLOT_COUNT >= 1) CXINC;
586 if (SLOT_COUNT >= 2) CXINC; 747 if (SLOT_COUNT >= 2) CXINC;
587 if (SLOT_COUNT >= 3) CXINC; 748 if (SLOT_COUNT >= 3) CXINC;
588 { 749 {
589 int i; 750 unsigned int i;
590 for (i = 3; i < SLOT_COUNT; ++i) 751 for (i = 3; i < SLOT_COUNT; ++i)
591 CXINC; 752 CXINC;
592 } 753 }
593 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 754 cxstack_ix -= SLOT_COUNT; /* undo allocation */
594 755
595 c->mainstack = PL_mainstack; 756 c->mainstack = PL_mainstack;
596 757
597 { 758 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 760
600 slot->defav = GvAV (PL_defgv); 761 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 762 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 763 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
604 766
605 #define VAR(name,type) slot->name = PL_ ## name; 767 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 768 # include "state.h"
607 #undef VAR 769 #undef VAR
608 } 770 }
… …
686#if !PERL_VERSION_ATLEAST (5,10,0) 848#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 849 Safefree (PL_retstack);
688#endif 850#endif
689} 851}
690 852
853#define CORO_RSS \
854 rss += sizeof (SYM (curstackinfo)); \
855 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
856 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
857 rss += SYM (tmps_max) * sizeof (SV *); \
858 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
859 rss += SYM (scopestack_max) * sizeof (I32); \
860 rss += SYM (savestack_max) * sizeof (ANY);
861
691static size_t 862static size_t
692coro_rss (pTHX_ struct coro *coro) 863coro_rss (pTHX_ struct coro *coro)
693{ 864{
694 size_t rss = sizeof (*coro); 865 size_t rss = sizeof (*coro);
695 866
696 if (coro->mainstack) 867 if (coro->mainstack)
697 { 868 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 869 if (coro->flags & CF_RUNNING)
702 { 870 {
703 slot = &tmp_slot; 871 #define SYM(sym) PL_ ## sym
704 872 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 873 #undef SYM
708 } 874 }
709 else 875 else
710 slot = coro->slot;
711
712 if (slot)
713 { 876 {
714 rss += sizeof (slot->curstackinfo); 877 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 878 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 879 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 880 }
726 } 881 }
727 882
728 return rss; 883 return rss;
729} 884}
… …
742#endif 897#endif
743 898
744/* 899/*
745 * This overrides the default magic get method of %SIG elements. 900 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 902 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 903 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 904 */
753static int 905static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 907{
756 const char *s = MgPV_nolen_const (mg); 908 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 961 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 962
811 if (svp) 963 if (svp)
812 { 964 {
813 SV *old = *svp; 965 SV *old = *svp;
814 *svp = newSVsv (sv); 966 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 967 SvREFCNT_dec (old);
816 return 0; 968 return 0;
817 } 969 }
818 } 970 }
819 971
… …
831slf_check_nop (pTHX_ struct CoroSLF *frame) 983slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 984{
833 return 0; 985 return 0;
834} 986}
835 987
836static UNOP coro_setup_op; 988static int
989slf_check_repeat (pTHX_ struct CoroSLF *frame)
990{
991 return 1;
992}
993
994static UNOP init_perl_op;
837 995
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
839coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
840{ 998{
841 /* 999 /*
842 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
843 */ 1001 */
844 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
845 1003
846 PL_runops = RUNOPS_DEFAULT; 1004 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 1005 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 1006 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 1007 PL_comppad = 0;
1008 PL_comppad_name = 0;
1009 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 1011 PL_curpm = 0;
851 PL_curpad = 0; 1012 PL_curpad = 0;
852 PL_localizing = 0; 1013 PL_localizing = 0;
853 PL_dirty = 0; 1014 PL_dirty = 0;
854 PL_restartop = 0; 1015 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 1016#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 1017 PL_parser = 0;
857#endif 1018#endif
1019 PL_hints = 0;
858 1020
859 /* recreate the die/warn hooks */ 1021 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 1024
863 GvSV (PL_defgv) = newSV (0); 1025 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 1026 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 1027 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 1030 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1031 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 1032
870 { 1033 {
871 dSP; 1034 dSP;
872 UNOP myop; 1035 UNOP myop;
873 1036
874 Zero (&myop, 1, UNOP); 1037 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 1038 myop.op_next = Nullop;
1039 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 1040 myop.op_flags = OPf_WANT_VOID;
877 1041
878 PUSHMARK (SP); 1042 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1043 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 1044 PUTBACK;
881 PL_op = (OP *)&myop; 1045 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1046 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 1047 }
885 1048
886 /* this newly created coroutine might be run on an existing cctx which most 1049 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 1051 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 1054
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 1056 init_perl_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 1057 init_perl_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
897 1060
898 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
899 1062
900 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
901 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
902}
903 1065
1066 SWAP_SVS (coro);
1067
1068 if (expect_false (enable_times))
1069 {
1070 coro_times_update ();
1071 coro_times_sub (coro);
1072 }
1073}
1074
904static void 1075static void
905coro_destruct (pTHX_ struct coro *coro) 1076coro_unwind_stacks (pTHX)
906{ 1077{
907 if (!IN_DESTRUCT) 1078 if (!IN_DESTRUCT)
908 { 1079 {
909 /* restore all saved variables and stuff */ 1080 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1081 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1089 POPSTACK_TO (PL_mainstack);
919 1090
920 /* unwind main stack */ 1091 /* unwind main stack */
921 dounwind (-1); 1092 dounwind (-1);
922 } 1093 }
1094}
923 1095
924 SvREFCNT_dec (GvSV (PL_defgv)); 1096static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1097destroy_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1098{
927 SvREFCNT_dec (PL_defoutgv); 1099 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1100
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1101 {
934 SvREFCNT_dec (CORO_THROW); 1102 struct coro *current = SvSTATE_current;
1103
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105
1106 save_perl (aTHX_ current);
1107 load_perl (aTHX_ coro);
1108
1109 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1114
1115 // now save some sv's to be free'd later
1116 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs;
1121 svf [5] = GvSV (irsgv);
1122 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf));
1126
1127 load_perl (aTHX_ current);
1128 }
1129
1130 {
1131 unsigned int i;
1132
1133 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1134 SvREFCNT_dec (svf [i]);
1135
935 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1137 SvREFCNT_dec (coro->rouse_cb);
937 1138 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1139 SvREFCNT_dec (coro->invoke_av);
1140 SvREFCNT_dec (coro->swap_sv);
1141 }
939} 1142}
940 1143
941INLINE void 1144INLINE void
942free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
943{ 1146{
… …
951static int 1154static int
952runops_trace (pTHX) 1155runops_trace (pTHX)
953{ 1156{
954 COP *oldcop = 0; 1157 COP *oldcop = 0;
955 int oldcxix = -2; 1158 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1159
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1161 {
961 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
962 1163
963 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1165 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1166 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1167 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1169 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
970 SV **cb; 1171 SV **cb;
… …
1007 1208
1008 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
1009 { 1210 {
1010 SV **cb; 1211 SV **cb;
1011 1212
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1214 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1216
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1218 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1219 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1220 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1221 SV *fullname = sv_2mortal (newSV (0));
1022 1222
1023 if (isGV (gv)) 1223 if (isGV (gv))
… …
1041 } 1241 }
1042 1242
1043 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1044 } 1244 }
1045 1245
1046 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1247 {
1048 dSP; 1248 dSP;
1049 1249
1050 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1251 ENTER;
… …
1070 1270
1071 TAINT_NOT; 1271 TAINT_NOT;
1072 return 0; 1272 return 0;
1073} 1273}
1074 1274
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1275static struct CoroSLF cctx_ssl_frame;
1077 1276
1078static void 1277static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1278slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1279{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1280 ta->prev = 0;
1083} 1281}
1084 1282
1085static int 1283static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1284slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1285{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1289}
1092 1290
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1292static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1293cctx_prepare (pTHX)
1096{ 1294{
1097 PL_top_env = &PL_start_env; 1295 PL_top_env = &PL_start_env;
1098 1296
1099 if (cctx->flags & CC_TRACE) 1297 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1298 PL_runops = runops_trace;
1101 1299
1102 /* we already must be executing an SLF op, there is no other valid way 1300 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1301 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1302 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1303 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1304
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1305 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1306 cctx_ssl_frame = slf_frame;
1110 1307
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1308 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1309 slf_frame.check = slf_check_set_stacklevel;
1113} 1310}
… …
1136 /* normally we would need to skip the entersub here */ 1333 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1334 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1335 /* PL_nop = PL_nop->op_next */
1139 1336
1140 /* inject a fake subroutine call to cctx_init */ 1337 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1338 cctx_prepare (aTHX);
1142 1339
1143 /* cctx_run is the alternative tail of transfer() */ 1340 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1341 transfer_tail (aTHX);
1145 1342
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1346 /*
1347 * Unfortunately, there is no way to get at the return values of the
1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1350 */
1149 1351
1150 /* 1352 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1353 * If perl-run returns we assume exit() was being called or the coro
1152 * fell off the end, which seems to be the only valid (non-bug) 1354 * fell off the end, which seems to be the only valid (non-bug)
1153 * reason for perl_run to return. We try to exit by jumping to the 1355 * reason for perl_run to return. We try to exit by jumping to the
1154 * bootstrap-time "top" top_env, as we cannot restore the "main" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1155 * coroutine as Coro has no such concept 1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1156 */ 1360 */
1157 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1363 }
1160} 1364}
… …
1237cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1238{ 1442{
1239 if (!cctx) 1443 if (!cctx)
1240 return; 1444 return;
1241 1445
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1447
1242 --cctx_count; 1448 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1244 1450
1245 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1246 if (cctx->sptr) 1452 if (cctx->sptr)
… …
1309 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1310 1516
1311 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1312 { 1518 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1314 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1315 1521
1316 if (expect_false (next->flags & CF_RUNNING))
1317 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1318
1319 if (expect_false (next->flags & CF_DESTROYED)) 1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1320 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1321 1524
1322#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1323 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1324 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1325#endif 1528#endif
… …
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1535{
1333 dSTACKLEVEL; 1536 dSTACKLEVEL;
1334 1537
1335 /* sometimes transfer is only called to set idle_sp */ 1538 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1539 if (expect_false (!prev))
1337 { 1540 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1541 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1543 }
1341 else if (expect_true (prev != next)) 1544 else if (expect_true (prev != next))
1342 { 1545 {
1343 coro_cctx *prev__cctx; 1546 coro_cctx *cctx_prev;
1344 1547
1345 if (expect_false (prev->flags & CF_NEW)) 1548 if (expect_false (prev->flags & CF_NEW))
1346 { 1549 {
1347 /* create a new empty/source context */ 1550 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1551 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1552 prev->flags |= CF_RUNNING;
1351 } 1553 }
1352 1554
1353 prev->flags &= ~CF_RUNNING; 1555 prev->flags &= ~CF_RUNNING;
… …
1359 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1360 { 1562 {
1361 /* need to start coroutine */ 1563 /* need to start coroutine */
1362 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1363 /* setup coroutine call */ 1565 /* setup coroutine call */
1364 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1365 } 1567 }
1366 else 1568 else
1367 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1368 1570
1369 prev__cctx = prev->cctx;
1370
1371 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1572 if (expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1575 && !force_cctx
1376 )) 1576 ))
1377 { 1577 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1379 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1580
1381 prev->cctx = 0;
1382
1383 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1384 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1582 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1583 if (expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1584 if (expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1585 next->cctx = cctx_get (aTHX);
1388 1586
1389 cctx_put (prev__cctx); 1587 cctx_put (cctx_current);
1390 } 1588 }
1589 else
1590 prev->cctx = cctx_current;
1391 1591
1392 ++next->usecount; 1592 ++next->usecount;
1393 1593
1394 if (expect_true (!next->cctx)) 1594 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1596
1397 if (expect_false (prev__cctx != next->cctx)) 1597 next->cctx = 0;
1598
1599 if (expect_false (cctx_prev != cctx_current))
1398 { 1600 {
1399 prev__cctx->top_env = PL_top_env; 1601 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1602 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1604 }
1403 1605
1404 transfer_tail (aTHX); 1606 transfer_tail (aTHX);
1405 } 1607 }
1406} 1608}
… …
1414coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1415{ 1617{
1416 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1417 return 0; 1619 return 0;
1418 1620
1419 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1420 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1421 1623
1422 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1423 1625
1424 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
… …
1428 --coro_nready; 1630 --coro_nready;
1429 } 1631 }
1430 else 1632 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1634
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1434 { 1636 && coro->mainstack != main_mainstack
1435 struct coro temp; 1637 && coro->slot
1436 1638 && !PL_dirty)
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1438
1439 save_perl (aTHX_ &temp);
1440 load_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1441
1442 coro_destruct (aTHX_ coro);
1443
1444 load_perl (aTHX_ &temp);
1445
1446 coro->slot = 0;
1447 }
1448 1640
1449 cctx_destroy (coro->cctx); 1641 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1642 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1643 SvREFCNT_dec (coro->args);
1644 SvREFCNT_dec (CORO_THROW);
1452 1645
1453 if (coro->next) coro->next->prev = coro->prev; 1646 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1647 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1648 if (coro == coro_first) coro_first = coro->next;
1456 1649
… …
1510 1703
1511 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1512 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1513} 1706}
1514 1707
1515/*****************************************************************************/
1516/* gensub: simple closure generation utility */
1517
1518#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1519
1520/* create a closure from XS, returns a code reference */
1521/* the arg can be accessed via GENSUB_ARG from the callback */
1522/* the callback must use dXSARGS/XSRETURN */
1523static SV *
1524gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1525{
1526 CV *cv = (CV *)newSV (0);
1527
1528 sv_upgrade ((SV *)cv, SVt_PVCV);
1529
1530 CvANON_on (cv);
1531 CvISXSUB_on (cv);
1532 CvXSUB (cv) = xsub;
1533 GENSUB_ARG = arg;
1534
1535 return newRV_noinc ((SV *)cv);
1536}
1537
1538/** Coro ********************************************************************/ 1708/** Coro ********************************************************************/
1539 1709
1540INLINE void 1710INLINE void
1541coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1542{ 1712{
1543 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1544}
1545 1714
1546INLINE SV * 1715 SvREFCNT_inc_NN (coro->hv);
1716
1717 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro;
1720}
1721
1722INLINE struct coro *
1547coro_deq (pTHX) 1723coro_deq (pTHX)
1548{ 1724{
1549 int prio; 1725 int prio;
1550 1726
1551 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1552 if (AvFILLp (coro_ready [prio]) >= 0) 1728 {
1553 return av_shift (coro_ready [prio]); 1729 struct coro **ready = coro_ready [prio];
1730
1731 if (ready [0])
1732 {
1733 struct coro *coro = ready [0];
1734 ready [0] = coro->next_ready;
1735 return coro;
1736 }
1737 }
1554 1738
1555 return 0; 1739 return 0;
1740}
1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1556} 1757}
1557 1758
1558static int 1759static int
1559api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1560{ 1761{
1561 struct coro *coro;
1562 SV *sv_hook;
1563 void (*xs_hook)(void);
1564
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1569 1763
1570 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1571 return 0; 1765 return 0;
1572 1766
1573 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1574 1768
1575 sv_hook = coro_nready ? 0 : coro_readyhook;
1576 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1577
1578 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1579 ++coro_nready;
1580 1770
1581 if (sv_hook) 1771 if (!coro_nready++)
1582 { 1772 if (coroapi.readyhook)
1583 dSP; 1773 coroapi.readyhook ();
1584
1585 ENTER;
1586 SAVETMPS;
1587
1588 PUSHMARK (SP);
1589 PUTBACK;
1590 call_sv (sv_hook, G_VOID | G_DISCARD);
1591
1592 FREETMPS;
1593 LEAVE;
1594 }
1595
1596 if (xs_hook)
1597 xs_hook ();
1598 1774
1599 return 1; 1775 return 1;
1600} 1776}
1601 1777
1602static int 1778static int
1603api_is_ready (pTHX_ SV *coro_sv) 1779api_is_ready (pTHX_ SV *coro_sv)
1604{ 1780{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1781 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1782}
1607 1783
1784/* expects to own a reference to next->hv */
1608INLINE void 1785INLINE void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1787{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;)
1614 {
1615 next_sv = coro_deq (aTHX);
1616
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv))
1619 {
1620 dSP;
1621
1622 ENTER;
1623 SAVETMPS;
1624
1625 PUSHMARK (SP);
1626 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628
1629 FREETMPS;
1630 LEAVE;
1631 continue;
1632 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current); 1788 SV *prev_sv = SvRV (coro_current);
1789
1650 ta->prev = SvSTATE_hv (prev_sv); 1790 ta->prev = SvSTATE_hv (prev_sv);
1791 ta->next = next;
1792
1651 TRANSFER_CHECK (*ta); 1793 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1794
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1795 SvRV_set (coro_current, (SV *)next->hv);
1655 1796
1656 free_coro_mortal (aTHX); 1797 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1798 coro_mortal = prev_sv;
1658} 1799}
1659 1800
1801static void
1802prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1803{
1804 for (;;)
1805 {
1806 struct coro *next = coro_deq (aTHX);
1807
1808 if (expect_true (next))
1809 {
1810 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else
1814 {
1815 next->flags &= ~CF_READY;
1816 --coro_nready;
1817
1818 prepare_schedule_to (aTHX_ ta, next);
1819 break;
1820 }
1821 }
1822 else
1823 {
1824 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle)))
1827 {
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready;
1831 }
1832 else
1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1835 dSP;
1836
1837 ENTER;
1838 SAVETMPS;
1839
1840 PUSHMARK (SP);
1841 PUTBACK;
1842 call_sv (sv_idle, G_VOID | G_DISCARD);
1843
1844 FREETMPS;
1845 LEAVE;
1846 }
1847 }
1848 }
1849}
1850
1660INLINE void 1851INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1852prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1853{
1663 api_ready (aTHX_ coro_current); 1854 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 1855 prepare_schedule (aTHX_ ta);
… …
1683{ 1874{
1684 struct coro_transfer_args ta; 1875 struct coro_transfer_args ta;
1685 1876
1686 prepare_schedule (aTHX_ &ta); 1877 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1878 TRANSFER (ta, 1);
1879}
1880
1881static void
1882api_schedule_to (pTHX_ SV *coro_sv)
1883{
1884 struct coro_transfer_args ta;
1885 struct coro *next = SvSTATE (coro_sv);
1886
1887 SvREFCNT_inc_NN (coro_sv);
1888 prepare_schedule_to (aTHX_ &ta, next);
1688} 1889}
1689 1890
1690static int 1891static int
1691api_cede (pTHX) 1892api_cede (pTHX)
1692{ 1893{
… …
1721static void 1922static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 1923api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 1924{
1724 struct coro *coro = SvSTATE (coro_sv); 1925 struct coro *coro = SvSTATE (coro_sv);
1725 1926
1927 if (coro->flags & CF_RUNNING)
1928 croak ("cannot enable tracing on a running coroutine, caught");
1929
1726 if (flags & CC_TRACE) 1930 if (flags & CC_TRACE)
1727 { 1931 {
1728 if (!coro->cctx) 1932 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1933 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1934 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 1935 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 1936
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1937 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1938 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1939 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1940 {
… …
1741 else 1945 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1946 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1947 }
1744} 1948}
1745 1949
1950static void
1951coro_call_on_destroy (pTHX_ struct coro *coro)
1952{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955
1956 if (on_destroyp)
1957 {
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959
1960 while (AvFILLp (on_destroy) >= 0)
1961 {
1962 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP);
1966
1967 if (statusp)
1968 {
1969 int i;
1970 AV *status = (AV *)SvRV (*statusp);
1971 EXTEND (SP, AvFILLp (status) + 1);
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 }
1976
1977 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1979 }
1980 }
1981}
1982
1983static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1985{
1986 int i;
1987 HV *hv = (HV *)SvRV (coro_current);
1988 AV *av = newAV ();
1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
1993 av_extend (av, items - 1);
1994
1995 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
1998
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2000
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager);
2003
2004 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat;
2006
2007 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/
2010}
2011
2012/*****************************************************************************/
2013/* async pool handler */
2014
2015static int
2016slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2017{
2018 HV *hv = (HV *)SvRV (coro_current);
2019 struct coro *coro = (struct coro *)frame->data;
2020
2021 if (!coro->invoke_cb)
2022 return 1; /* loop till we have invoke */
2023 else
2024 {
2025 hv_store (hv, "desc", sizeof ("desc") - 1,
2026 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2027
2028 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2029
2030 {
2031 dSP;
2032 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2033 PUTBACK;
2034 }
2035
2036 SvREFCNT_dec (GvAV (PL_defgv));
2037 GvAV (PL_defgv) = coro->invoke_av;
2038 coro->invoke_av = 0;
2039
2040 return 0;
2041 }
2042}
2043
2044static void
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{
2047 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049
2050 if (expect_true (coro->saved_deffh))
2051 {
2052 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0;
2055
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2060 coro->invoke_av = newAV ();
2061
2062 frame->prepare = prepare_nop;
2063 }
2064 else
2065 {
2066 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2068
2069 coro->prio = 0;
2070
2071 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2072 api_trace (aTHX_ coro_current, 0);
2073
2074 frame->prepare = prepare_schedule;
2075 av_push (av_async_pool, SvREFCNT_inc (hv));
2076 }
2077 }
2078 else
2079 {
2080 /* first iteration, simply fall through */
2081 frame->prepare = prepare_nop;
2082 }
2083
2084 frame->check = slf_check_pool_handler;
2085 frame->data = (void *)coro;
2086}
2087
1746/*****************************************************************************/ 2088/*****************************************************************************/
1747/* rouse callback */ 2089/* rouse callback */
1748 2090
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2091#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 2092
1751static void 2093static void
1752coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
1753{ 2095{
1754 dXSARGS; 2096 dXSARGS;
1755 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
1756 2098
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 2100 {
1759 /* first call, set args */ 2101 /* first call, set args */
1760 int i; 2102 SV *coro = SvRV (data);
1761 AV *av = newAV (); 2103 AV *av = newAV ();
1762 SV *coro = SvRV (data);
1763 2104
1764 SvRV_set (data, (SV *)av); 2105 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro);
1766 SvREFCNT_dec (coro);
1767 2106
1768 /* better take a full copy of the arguments */ 2107 /* better take a full copy of the arguments */
1769 while (items--) 2108 while (items--)
1770 av_store (av, items, newSVsv (ST (items))); 2109 av_store (av, items, newSVsv (ST (items)));
2110
2111 api_ready (aTHX_ coro);
2112 SvREFCNT_dec (coro);
1771 } 2113 }
1772 2114
1773 XSRETURN_EMPTY; 2115 XSRETURN_EMPTY;
1774} 2116}
1775 2117
… …
1792 2134
1793 EXTEND (SP, AvFILLp (av) + 1); 2135 EXTEND (SP, AvFILLp (av) + 1);
1794 for (i = 0; i <= AvFILLp (av); ++i) 2136 for (i = 0; i <= AvFILLp (av); ++i)
1795 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2137 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1796 2138
1797 /* we have stolen the elements, so ste length to zero and free */ 2139 /* we have stolen the elements, so set length to zero and free */
1798 AvFILLp (av) = -1; 2140 AvFILLp (av) = -1;
1799 av_undef (av); 2141 av_undef (av);
1800 2142
1801 PUTBACK; 2143 PUTBACK;
1802 } 2144 }
… …
1826 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
1827 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1828 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
1829 2171
1830 { 2172 {
1831 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1832 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
1833 2175
1834 frame->data = (void *)data; 2176 frame->data = (void *)data;
1835 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1836 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
1837 } 2179 }
… …
1841coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
1842{ 2184{
1843 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
1844 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
1845 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
1846 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1847 2189
1848 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1849 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
1850 2192
1851 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
… …
1906static void 2248static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2249slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2250{
1909 frame->prepare = prepare_schedule; 2251 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2252 frame->check = slf_check_nop;
2253}
2254
2255static void
2256slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2257{
2258 struct coro *next = (struct coro *)slf_frame.data;
2259
2260 SvREFCNT_inc_NN (next->hv);
2261 prepare_schedule_to (aTHX_ ta, next);
2262}
2263
2264static void
2265slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2266{
2267 if (!items)
2268 croak ("Coro::schedule_to expects a coroutine argument, caught");
2269
2270 frame->data = (void *)SvSTATE (arg [0]);
2271 frame->prepare = slf_prepare_schedule_to;
2272 frame->check = slf_check_nop;
2273}
2274
2275static void
2276slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2277{
2278 api_ready (aTHX_ SvRV (coro_current));
2279
2280 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2281}
1912 2282
1913static void 2283static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2284slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2285{
… …
2061 } 2431 }
2062 else 2432 else
2063 slf_argc = 0; 2433 slf_argc = 0;
2064 2434
2065 PL_op->op_ppaddr = pp_slf; 2435 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2436 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2437
2068 PL_op = (OP *)&slf_restore; 2438 PL_op = (OP *)&slf_restore;
2439}
2440
2441/*****************************************************************************/
2442/* dynamic wind */
2443
2444static void
2445on_enterleave_call (pTHX_ SV *cb)
2446{
2447 dSP;
2448
2449 PUSHSTACK;
2450
2451 PUSHMARK (SP);
2452 PUTBACK;
2453 call_sv (cb, G_VOID | G_DISCARD);
2454 SPAGAIN;
2455
2456 POPSTACK;
2457}
2458
2459static SV *
2460coro_avp_pop_and_free (pTHX_ AV **avp)
2461{
2462 AV *av = *avp;
2463 SV *res = av_pop (av);
2464
2465 if (AvFILLp (av) < 0)
2466 {
2467 *avp = 0;
2468 SvREFCNT_dec (av);
2469 }
2470
2471 return res;
2472}
2473
2474static void
2475coro_pop_on_enter (pTHX_ void *coro)
2476{
2477 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2478 SvREFCNT_dec (cb);
2479}
2480
2481static void
2482coro_pop_on_leave (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2485 on_enterleave_call (aTHX_ sv_2mortal (cb));
2069} 2486}
2070 2487
2071/*****************************************************************************/ 2488/*****************************************************************************/
2072/* PerlIO::cede */ 2489/* PerlIO::cede */
2073 2490
… …
2147/* Coro::Semaphore & Coro::Signal */ 2564/* Coro::Semaphore & Coro::Signal */
2148 2565
2149static SV * 2566static SV *
2150coro_waitarray_new (pTHX_ int count) 2567coro_waitarray_new (pTHX_ int count)
2151{ 2568{
2152 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2569 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2153 AV *av = newAV (); 2570 AV *av = newAV ();
2154 SV **ary; 2571 SV **ary;
2155 2572
2156 /* unfortunately, building manually saves memory */ 2573 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2574 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2575 AvALLOC (av) = ary;
2576#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2577 AvARRAY (av) = ary;
2578#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2579 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2580 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2581 SvPVX ((SV *)av) = (char *)ary;
2582#endif
2161 AvMAX (av) = 1; 2583 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2584 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2585 ary [0] = newSViv (count);
2164 2586
2165 return newRV_noinc ((SV *)av); 2587 return newRV_noinc ((SV *)av);
… …
2294{ 2716{
2295 if (items >= 2) 2717 if (items >= 2)
2296 { 2718 {
2297 /* callback form */ 2719 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2720 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2300 2722
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2302 2724
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2726 coro_semaphore_adjust (aTHX_ av, 0);
2305 2727
2306 frame->prepare = prepare_nop; 2728 frame->prepare = prepare_nop;
… …
2330 AvARRAY (av)[0] = AvARRAY (av)[1]; 2752 AvARRAY (av)[0] = AvARRAY (av)[1];
2331 AvARRAY (av)[1] = cb; 2753 AvARRAY (av)[1] = cb;
2332 2754
2333 cb = av_shift (av); 2755 cb = av_shift (av);
2334 2756
2757 if (SvTYPE (cb) == SVt_PVCV)
2758 {
2759 dSP;
2760 PUSHMARK (SP);
2761 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2762 PUTBACK;
2763 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2764 }
2765 else
2766 {
2335 api_ready (aTHX_ cb); 2767 api_ready (aTHX_ cb);
2336 sv_setiv (cb, 0); /* signal waiter */ 2768 sv_setiv (cb, 0); /* signal waiter */
2769 }
2770
2337 SvREFCNT_dec (cb); 2771 SvREFCNT_dec (cb);
2338 2772
2339 --count; 2773 --count;
2340 } 2774 }
2341} 2775}
… …
2350static void 2784static void
2351slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2785slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2352{ 2786{
2353 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2354 2788
2789 if (items >= 2)
2790 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793
2355 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2796
2797 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop;
2799 }
2800 else if (SvIVX (AvARRAY (av)[0]))
2356 { 2801 {
2357 SvIVX (AvARRAY (av)[0]) = 0; 2802 SvIVX (AvARRAY (av)[0]) = 0;
2358 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2359 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2360 } 2805 }
2361 else 2806 else
2362 { 2807 {
2363 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2808 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2364 2809
2365 av_push (av, waiter); 2810 av_push (av, waiter);
2366 2811
2367 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2812 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2368 frame->prepare = prepare_schedule; 2813 frame->prepare = prepare_schedule;
… …
2386 2831
2387static void 2832static void
2388coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2389{ 2834{
2390 dXSARGS; 2835 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2392 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2394 2839
2395 av_extend (state, items); 2840 av_extend (state, items - 1);
2396 2841
2397 sv_upgrade (data_sv, SVt_PV); 2842 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2843 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2844 SvPOK_only (data_sv);
2400 2845
… …
2510 2955
2511 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2512 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2513 2958
2514 /* now push the callback closure */ 2959 /* now push the callback closure */
2515 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2516 2961
2517 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2518 PUTBACK; 2963 PUTBACK;
2519 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2520 } 2965 }
… …
2534 2979
2535 XSRETURN_EMPTY; 2980 XSRETURN_EMPTY;
2536} 2981}
2537 2982
2538/*****************************************************************************/ 2983/*****************************************************************************/
2984
2985#if CORO_CLONE
2986# include "clone.c"
2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2539 3046
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 3048
2542PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2543 3050
… …
2548 coro_thx = PERL_GET_CONTEXT; 3055 coro_thx = PERL_GET_CONTEXT;
2549# endif 3056# endif
2550#endif 3057#endif
2551 BOOT_PAGESIZE; 3058 BOOT_PAGESIZE;
2552 3059
3060 cctx_current = cctx_new_empty ();
3061
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 3064
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3065 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2557 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3066 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2576 3085
2577 { 3086 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3087 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 3088
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3089 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 3090 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 3091
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3092 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 3093 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 3094 }
2588 3095
2589 coroapi.ver = CORO_API_VERSION; 3096 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 3097 coroapi.rev = CORO_API_REVISION;
2591 3098
… …
2603 3110
2604 if (!svp) croak ("Time::HiRes is required"); 3111 if (!svp) croak ("Time::HiRes is required");
2605 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2606 3113
2607 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2608 } 3118 }
2609 3119
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2611} 3121}
2612 3122
2613SV * 3123SV *
2614new (char *klass, ...) 3124new (SV *klass, ...)
3125 ALIAS:
3126 Coro::new = 1
2615 CODE: 3127 CODE:
2616{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2617 struct coro *coro; 3129 OUTPUT:
2618 MAGIC *mg;
2619 HV *hv;
2620 CV *cb;
2621 int i;
2622
2623 if (items > 1)
2624 {
2625 cb = coro_sv_2cv (ST (1));
2626
2627 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629
2630 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2632 }
2633
2634 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV ();
2636 coro->flags = CF_NEW;
2637
2638 if (coro_first) coro_first->prev = coro;
2639 coro->next = coro_first;
2640 coro_first = coro;
2641
2642 coro->hv = hv = newHV ();
2643 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2644 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646
2647 if (items > 1)
2648 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1);
2652 av_push (coro->args, SvREFCNT_inc (cb));
2653 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i)));
2655 }
2656}
2657 OUTPUT:
2658 RETVAL 3130 RETVAL
2659 3131
2660void 3132void
2661transfer (...) 3133transfer (...)
2662 PROTOTYPE: $$ 3134 PROTOTYPE: $$
… …
2673void 3145void
2674_exit (int code) 3146_exit (int code)
2675 PROTOTYPE: $ 3147 PROTOTYPE: $
2676 CODE: 3148 CODE:
2677 _exit (code); 3149 _exit (code);
3150
3151SV *
3152clone (Coro::State coro)
3153 CODE:
3154{
3155#if CORO_CLONE
3156 struct coro *ncoro = coro_clone (aTHX_ coro);
3157 MAGIC *mg;
3158 /* TODO: too much duplication */
3159 ncoro->hv = newHV ();
3160 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3161 mg->mg_flags |= MGf_DUP;
3162 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3163#else
3164 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3165#endif
3166}
3167 OUTPUT:
3168 RETVAL
2678 3169
2679int 3170int
2680cctx_stacksize (int new_stacksize = 0) 3171cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 3172 PROTOTYPE: ;$
2682 CODE: 3173 CODE:
… …
2732 eval = 1 3223 eval = 1
2733 CODE: 3224 CODE:
2734{ 3225{
2735 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2736 { 3227 {
2737 struct coro temp; 3228 struct coro *current = SvSTATE_current;
2738 3229
2739 if (!(coro->flags & CF_RUNNING)) 3230 if (current != coro)
2740 { 3231 {
2741 PUTBACK; 3232 PUTBACK;
2742 save_perl (aTHX_ &temp); 3233 save_perl (aTHX_ current);
2743 load_perl (aTHX_ coro); 3234 load_perl (aTHX_ coro);
3235 SPAGAIN;
2744 } 3236 }
2745 3237
2746 {
2747 dSP;
2748 ENTER;
2749 SAVETMPS;
2750 PUTBACK;
2751 PUSHSTACK; 3238 PUSHSTACK;
3239
2752 PUSHMARK (SP); 3240 PUSHMARK (SP);
3241 PUTBACK;
2753 3242
2754 if (ix) 3243 if (ix)
2755 eval_sv (coderef, 0); 3244 eval_sv (coderef, 0);
2756 else 3245 else
2757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3246 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2758 3247
2759 POPSTACK; 3248 POPSTACK;
2760 SPAGAIN; 3249 SPAGAIN;
2761 FREETMPS;
2762 LEAVE;
2763 PUTBACK;
2764 }
2765 3250
2766 if (!(coro->flags & CF_RUNNING)) 3251 if (current != coro)
2767 { 3252 {
3253 PUTBACK;
2768 save_perl (aTHX_ coro); 3254 save_perl (aTHX_ coro);
2769 load_perl (aTHX_ &temp); 3255 load_perl (aTHX_ current);
2770 SPAGAIN; 3256 SPAGAIN;
2771 } 3257 }
2772 } 3258 }
2773} 3259}
2774 3260
… …
2778 ALIAS: 3264 ALIAS:
2779 is_ready = CF_READY 3265 is_ready = CF_READY
2780 is_running = CF_RUNNING 3266 is_running = CF_RUNNING
2781 is_new = CF_NEW 3267 is_new = CF_NEW
2782 is_destroyed = CF_DESTROYED 3268 is_destroyed = CF_DESTROYED
3269 is_suspended = CF_SUSPENDED
2783 CODE: 3270 CODE:
2784 RETVAL = boolSV (coro->flags & ix); 3271 RETVAL = boolSV (coro->flags & ix);
2785 OUTPUT: 3272 OUTPUT:
2786 RETVAL 3273 RETVAL
2787 3274
… …
2791 CODE: 3278 CODE:
2792{ 3279{
2793 struct coro *current = SvSTATE_current; 3280 struct coro *current = SvSTATE_current;
2794 SV **throwp = self == current ? &CORO_THROW : &self->except; 3281 SV **throwp = self == current ? &CORO_THROW : &self->except;
2795 SvREFCNT_dec (*throwp); 3282 SvREFCNT_dec (*throwp);
3283 SvGETMAGIC (throw);
2796 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2797} 3285}
2798 3286
2799void 3287void
2800api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2803 3291
2804SV * 3292SV *
2805has_cctx (Coro::State coro) 3293has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3294 PROTOTYPE: $
2807 CODE: 3295 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3296 /* maybe manage the running flag differently */
3297 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3298 OUTPUT:
2810 RETVAL 3299 RETVAL
2811 3300
2812int 3301int
2813is_traced (Coro::State coro) 3302is_traced (Coro::State coro)
… …
2833 3322
2834void 3323void
2835force_cctx () 3324force_cctx ()
2836 PROTOTYPE: 3325 PROTOTYPE:
2837 CODE: 3326 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3327 cctx_current->idle_sp = 0;
2839 3328
2840void 3329void
2841swap_defsv (Coro::State self) 3330swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3331 PROTOTYPE: $
2843 ALIAS: 3332 ALIAS:
… …
2851 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3340 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2852 3341
2853 SV *tmp = *src; *src = *dst; *dst = tmp; 3342 SV *tmp = *src; *src = *dst; *dst = tmp;
2854 } 3343 }
2855 3344
3345void
3346cancel (Coro::State self)
3347 CODE:
3348 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351
3352SV *
3353enable_times (int enabled = enable_times)
3354 CODE:
3355{
3356 RETVAL = boolSV (enable_times);
3357
3358 if (enabled != enable_times)
3359 {
3360 enable_times = enabled;
3361
3362 coro_times_update ();
3363 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3364 }
3365}
3366 OUTPUT:
3367 RETVAL
3368
3369void
3370times (Coro::State self)
3371 PPCODE:
3372{
3373 struct coro *current = SvSTATE (coro_current);
3374
3375 if (expect_false (current == self))
3376 {
3377 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current));
3379 }
3380
3381 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384
3385 if (expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current));
3387}
3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (sv));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (swapsv));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
2856 3408
2857MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
2858 3410
2859BOOT: 3411BOOT:
2860{ 3412{
2861 int i;
2862
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2869 3422
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3429
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2874 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2875 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3433 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2876 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3434 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2877 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3435 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2878
2879 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2880 coro_ready[i] = newAV ();
2881 3436
2882 { 3437 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3438 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3439
2885 coroapi.schedule = api_schedule; 3440 coroapi.schedule = api_schedule;
3441 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3442 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3443 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3444 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3445 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3446 coroapi.nready = coro_nready;
… …
2894 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
2895 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
2896 } 3452 }
2897} 3453}
2898 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3464void
3465terminate (...)
3466 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3468
2899void 3469void
2900schedule (...) 3470schedule (...)
2901 CODE: 3471 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3472 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3473
3474void
3475schedule_to (...)
3476 CODE:
3477 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3478
3479void
3480cede_to (...)
3481 CODE:
3482 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3483
2904void 3484void
2905cede (...) 3485cede (...)
2906 CODE: 3486 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3487 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2921void 3501void
2922_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
2923 PROTOTYPE: $ 3503 PROTOTYPE: $
2924 CODE: 3504 CODE:
2925 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
2926 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
2927 3517
2928int 3518int
2929prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
2930 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
2931 ALIAS: 3521 ALIAS:
… …
2937 if (items > 1) 3527 if (items > 1)
2938 { 3528 {
2939 if (ix) 3529 if (ix)
2940 newprio = coro->prio - newprio; 3530 newprio = coro->prio - newprio;
2941 3531
2942 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3532 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2943 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3533 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2944 3534
2945 coro->prio = newprio; 3535 coro->prio = newprio;
2946 } 3536 }
2947} 3537}
2948 OUTPUT: 3538 OUTPUT:
… …
2962 CODE: 3552 CODE:
2963 RETVAL = coro_nready; 3553 RETVAL = coro_nready;
2964 OUTPUT: 3554 OUTPUT:
2965 RETVAL 3555 RETVAL
2966 3556
2967# for async_pool speedup
2968void 3557void
2969_pool_1 (SV *cb) 3558suspend (Coro::State self)
3559 PROTOTYPE: $
2970 CODE: 3560 CODE:
2971{ 3561 self->flags |= CF_SUSPENDED;
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 3562
2979 if (!invoke) 3563void
3564resume (Coro::State self)
3565 PROTOTYPE: $
3566 CODE:
3567 self->flags &= ~CF_SUSPENDED;
3568
3569void
3570_pool_handler (...)
3571 CODE:
3572 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3573
3574void
3575async_pool (SV *cv, ...)
3576 PROTOTYPE: &@
3577 PPCODE:
3578{
3579 HV *hv = (HV *)av_pop (av_async_pool);
3580 AV *av = newAV ();
3581 SV *cb = ST (0);
3582 int i;
3583
3584 av_extend (av, items - 2);
3585 for (i = 1; i < items; ++i)
3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3587
3588 if ((SV *)hv == &PL_sv_undef)
2980 { 3589 {
2981 SV *old = PL_diehook; 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2982 PL_diehook = 0; 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2983 SvREFCNT_dec (old); 3592 SvREFCNT_dec (sv);
2984 croak ("\3async_pool terminate\2\n");
2985 } 3593 }
2986 3594
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 3595 {
3000 av_fill (defav, len - 1); 3596 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3597
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3598 assert (!coro->invoke_cb);
3599 assert (!coro->invoke_av);
3600 coro->invoke_cb = SvREFCNT_inc (cb);
3601 coro->invoke_av = av;
3003 } 3602 }
3004}
3005 3603
3006void 3604 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 3605
3013 sv_setsv (cb, &PL_sv_undef); 3606 if (GIMME_V != G_VOID)
3014 3607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3608 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 3609 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 3610}
3038 3611
3039SV * 3612SV *
3040rouse_cb () 3613rouse_cb ()
3041 PROTOTYPE: 3614 PROTOTYPE:
… …
3048rouse_wait (...) 3621rouse_wait (...)
3049 PROTOTYPE: ;$ 3622 PROTOTYPE: ;$
3050 PPCODE: 3623 PPCODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3624 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3052 3625
3626void
3627on_enter (SV *block)
3628 ALIAS:
3629 on_leave = 1
3630 PROTOTYPE: &
3631 CODE:
3632{
3633 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635
3636 block = s_get_cv_croak (block);
3637
3638 if (!*avp)
3639 *avp = newAV ();
3640
3641 av_push (*avp, SvREFCNT_inc (block));
3642
3643 if (!ix)
3644 on_enterleave_call (aTHX_ block);
3645
3646 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3647 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3648 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3649}
3650
3053 3651
3054MODULE = Coro::State PACKAGE = PerlIO::cede 3652MODULE = Coro::State PACKAGE = PerlIO::cede
3055 3653
3056BOOT: 3654BOOT:
3057 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3655 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3060MODULE = Coro::State PACKAGE = Coro::Semaphore 3658MODULE = Coro::State PACKAGE = Coro::Semaphore
3061 3659
3062SV * 3660SV *
3063new (SV *klass, SV *count = 0) 3661new (SV *klass, SV *count = 0)
3064 CODE: 3662 CODE:
3663{
3664 int semcnt = 1;
3665
3666 if (count)
3667 {
3668 SvGETMAGIC (count);
3669
3670 if (SvOK (count))
3671 semcnt = SvIV (count);
3672 }
3673
3065 RETVAL = sv_bless ( 3674 RETVAL = sv_bless (
3066 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3675 coro_waitarray_new (aTHX_ semcnt),
3067 GvSTASH (CvGV (cv)) 3676 GvSTASH (CvGV (cv))
3068 ); 3677 );
3678}
3069 OUTPUT: 3679 OUTPUT:
3070 RETVAL 3680 RETVAL
3071 3681
3072# helper for Coro::Channel 3682# helper for Coro::Channel and others
3073SV * 3683SV *
3074_alloc (int count) 3684_alloc (int count)
3075 CODE: 3685 CODE:
3076 RETVAL = coro_waitarray_new (aTHX_ count); 3686 RETVAL = coro_waitarray_new (aTHX_ count);
3077 OUTPUT: 3687 OUTPUT:
… …
3135 for (i = 1; i <= wcount; ++i) 3745 for (i = 1; i <= wcount; ++i)
3136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3746 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3137 } 3747 }
3138} 3748}
3139 3749
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751
3752void
3753_may_delete (SV *sem, int count, int extra_refs)
3754 PPCODE:
3755{
3756 AV *av = (AV *)SvRV (sem);
3757
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES;
3762
3763 XSRETURN_NO;
3764}
3765
3140MODULE = Coro::State PACKAGE = Coro::Signal 3766MODULE = Coro::State PACKAGE = Coro::Signal
3141 3767
3142SV * 3768SV *
3143new (SV *klass) 3769new (SV *klass)
3144 CODE: 3770 CODE:
… …
3215 3841
3216void 3842void
3217_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3218 CODE: 3844 CODE:
3219{ 3845{
3220 CV *req_cv = coro_sv_2cv (req); 3846 SV *req_cv = s_get_cv_croak (req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3851}
3226 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

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