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.301 by root, Wed Nov 19 02:41:31 2008 UTC vs.
Revision 1.377 by root, Sat Oct 3 17:55:04 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
21# define setjmp _setjmp // deep magic, don't ask 27# define setjmp _setjmp /* deep magic */
22#else 28#else
23# include <inttypes.h> /* most portable stdint.h */ 29# include <inttypes.h> /* most portable stdint.h */
24#endif 30#endif
25 31
26#ifdef HAVE_MMAP 32#ifdef HAVE_MMAP
… …
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
… …
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;
245 228
229 /* ready queue */
230 struct coro *next_ready;
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 */
250 236
237 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 238 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 239 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 242 void (*on_destroy)(pTHX_ struct coro *coro);
256 243
257 /* statistics */ 244 /* statistics */
258 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
259 246
260 /* coro process data */ 247 /* coro process data */
261 int prio; 248 int prio;
262 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
250 SV *rouse_cb;
263 251
264 /* async_pool */ 252 /* async_pool */
265 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;
266 266
267 /* linked list */ 267 /* linked list */
268 struct coro *next, *prev; 268 struct coro *next, *prev;
269}; 269};
270 270
… …
276/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
278 278
279/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
280 280
281#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
282#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
283#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
284#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
285#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
286#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
287 287
288/* for Coro.pm */ 288/* for Coro.pm */
289static SV *coro_current; 289static SV *coro_current;
290static SV *coro_readyhook; 290static SV *coro_readyhook;
291static 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;
292static struct coro *coro_first; 293static struct coro *coro_first;
293#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}
294 315
295/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
296 317
297static SV * 318static SV *
298coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
322 get_hv (name, create); 343 get_hv (name, create);
323#endif 344#endif
324 return get_hv (name, create); 345 return get_hv (name, create);
325} 346}
326 347
348INLINE void
349coro_times_update ()
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{
417 HV *stash;
418 MAGIC *mg;
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;
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 */
446
327static AV * 447static AV *
328coro_clone_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
329{ 449{
330 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 451 AV *newpadlist, *newpad;
332 452
333 newpadlist = newAV (); 453 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 459#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 461 --AvFILLp (padlist);
342 462
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
345 465
346 return newpadlist; 466 return newpadlist;
347} 467}
348 468
349static void 469static void
350free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
351{ 471{
352 /* may be during global destruction */ 472 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
354 { 474 {
355 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
356 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
357 { 478 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
359 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 481 I32 j = AvFILLp (av);
361 SV *sv; 482
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 488 }
368 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
370 } 494 }
371} 495}
372 496
373static int 497static int
374coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
375{ 499{
376 AV *padlist; 500 AV *padlist;
377 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;
378 506
379 /* casting is fun. */ 507 /* casting is fun. */
380 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
381 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
382 510
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 512
385 return 0; 513 return 0;
386} 514}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 515
391static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 517 0, 0, 0, 0,
393 coro_cv_free 518 coro_cv_free
394}; 519};
395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
401#define CORO_MAGIC(sv, type) \
402 (expect_true (SvMAGIC (sv)) \
403 ? CORO_MAGIC_NN (sv, type) \
404 : 0)
405
406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
408
409INLINE struct coro *
410SvSTATE_ (pTHX_ SV *coro)
411{
412 HV *stash;
413 MAGIC *mg;
414
415 if (SvROK (coro))
416 coro = SvRV (coro);
417
418 if (expect_false (SvTYPE (coro) != SVt_PVHV))
419 croak ("Coro::State object required");
420
421 stash = SvSTASH (coro);
422 if (expect_false (stash != coro_stash && stash != coro_state_stash))
423 {
424 /* very slow, but rare, check */
425 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
426 croak ("Coro::State object required");
427 }
428
429 mg = CORO_MAGIC_state (coro);
430 return (struct coro *)mg->mg_ptr;
431}
432
433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
438 520
439/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
440static void 522static void
441get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
442{ 524{
… …
448 else 530 else
449 { 531 {
450#if CORO_PREFER_PERL_FUNCTIONS 532#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 533 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 534 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 535 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 536 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 537 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 538 SvREFCNT_dec (cp);
457#else 539#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 541#endif
460 } 542 }
461} 543}
462 544
463static void 545static void
… …
470 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);
471 553
472 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
473 555
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
476 558
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 560}
479 561
480/** 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);
481 617
482static void 618static void
483load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
484{ 620{
485 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
486 c->slot = 0; 622 c->slot = 0;
487 623
488 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
489 625
490 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
494 631
495 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 633 # include "state.h"
497 #undef VAR 634 #undef VAR
498 635
… …
512 PUTBACK; 649 PUTBACK;
513 } 650 }
514 651
515 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
516 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);
517} 672}
518 673
519static void 674static void
520save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
521{ 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
522 c->except = CORO_THROW; 695 c->except = CORO_THROW;
523 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
524 697
525 { 698 {
526 dSP; 699 dSP;
… …
539 { 712 {
540 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
541 { 714 {
542 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
543 716
544 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))
545 { 718 {
546 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
547 720
548 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
549 { 722 {
… …
573 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
574 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
575 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
576 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
577 { 750 {
578 int i; 751 unsigned int i;
579 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
580 CXINC; 753 CXINC;
581 } 754 }
582 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
583 756
584 c->mainstack = PL_mainstack; 757 c->mainstack = PL_mainstack;
585 758
586 { 759 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 761
589 slot->defav = GvAV (PL_defgv); 762 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 763 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 764 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
593 767
594 #define VAR(name,type) slot->name = PL_ ## name; 768 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 769 # include "state.h"
596 #undef VAR 770 #undef VAR
597 } 771 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 776 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 777 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 778 * not usually need a lot of stackspace.
605 */ 779 */
606#if CORO_PREFER_PERL_FUNCTIONS 780#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 781# define coro_init_stacks(thx) init_stacks ()
608#else 782#else
609static void 783static void
610coro_init_stacks (pTHX) 784coro_init_stacks (pTHX)
611{ 785{
612 PL_curstackinfo = new_stackinfo(32, 8); 786 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 849#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 850 Safefree (PL_retstack);
677#endif 851#endif
678} 852}
679 853
854#define CORO_RSS \
855 rss += sizeof (SYM (curstackinfo)); \
856 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
857 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
858 rss += SYM (tmps_max) * sizeof (SV *); \
859 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
860 rss += SYM (scopestack_max) * sizeof (I32); \
861 rss += SYM (savestack_max) * sizeof (ANY);
862
680static size_t 863static size_t
681coro_rss (pTHX_ struct coro *coro) 864coro_rss (pTHX_ struct coro *coro)
682{ 865{
683 size_t rss = sizeof (*coro); 866 size_t rss = sizeof (*coro);
684 867
685 if (coro->mainstack) 868 if (coro->mainstack)
686 { 869 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 870 if (coro->flags & CF_RUNNING)
691 { 871 {
692 slot = &tmp_slot; 872 #define SYM(sym) PL_ ## sym
693 873 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 874 #undef SYM
697 } 875 }
698 else 876 else
699 slot = coro->slot;
700
701 if (slot)
702 { 877 {
703 rss += sizeof (slot->curstackinfo); 878 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 879 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 880 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 881 }
715 } 882 }
716 883
717 return rss; 884 return rss;
718} 885}
… …
731#endif 898#endif
732 899
733/* 900/*
734 * This overrides the default magic get method of %SIG elements. 901 * This overrides the default magic get method of %SIG elements.
735 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 902 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
736 * and instead of tryign to save and restore the hash elements, we just provide 903 * and instead of trying to save and restore the hash elements, we just provide
737 * readback here. 904 * readback here.
738 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
739 * not expecting this to actually change the hook. This is a potential problem
740 * when a schedule happens then, but we ignore this.
741 */ 905 */
742static int 906static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 908{
745 const char *s = MgPV_nolen_const (mg); 909 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 963
800 if (svp) 964 if (svp)
801 { 965 {
802 SV *old = *svp; 966 SV *old = *svp;
803 *svp = newSVsv (sv); 967 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 968 SvREFCNT_dec (old);
805 return 0; 969 return 0;
806 } 970 }
807 } 971 }
808 972
… …
820slf_check_nop (pTHX_ struct CoroSLF *frame) 984slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 985{
822 return 0; 986 return 0;
823} 987}
824 988
825static UNOP coro_setup_op; 989static int
990slf_check_repeat (pTHX_ struct CoroSLF *frame)
991{
992 return 1;
993}
994
995static UNOP init_perl_op;
826 996
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
828coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
829{ 999{
830 /* 1000 /*
831 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
832 */ 1002 */
833 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
834 1004
835 PL_runops = RUNOPS_DEFAULT; 1005 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 1006 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 1007 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 1008 PL_comppad = 0;
1009 PL_comppad_name = 0;
1010 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 1012 PL_curpm = 0;
840 PL_curpad = 0; 1013 PL_curpad = 0;
841 PL_localizing = 0; 1014 PL_localizing = 0;
842 PL_dirty = 0; 1015 PL_dirty = 0;
843 PL_restartop = 0; 1016 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 1017#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 1018 PL_parser = 0;
846#endif 1019#endif
1020 PL_hints = 0;
847 1021
848 /* recreate the die/warn hooks */ 1022 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1023 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
850 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 1025
852 GvSV (PL_defgv) = newSV (0); 1026 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 1027 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 1028 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 1031 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 1033
859 { 1034 {
860 dSP; 1035 dSP;
861 UNOP myop; 1036 UNOP myop;
862 1037
863 Zero (&myop, 1, UNOP); 1038 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 1039 myop.op_next = Nullop;
1040 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 1041 myop.op_flags = OPf_WANT_VOID;
866 1042
867 PUSHMARK (SP); 1043 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1044 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 1045 PUTBACK;
870 PL_op = (OP *)&myop; 1046 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1047 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 1048 }
874 1049
875 /* this newly created coroutine might be run on an existing cctx which most 1050 /* this newly created coroutine might be run on an existing cctx which most
876 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 1052 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
879 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 1055
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 1058 init_perl_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
886 1061
887 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
888 1063
889 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
890 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
891}
892 1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
1074}
1075
893static void 1076static void
894coro_destruct (pTHX_ struct coro *coro) 1077coro_unwind_stacks (pTHX)
895{ 1078{
896 if (!IN_DESTRUCT) 1079 if (!IN_DESTRUCT)
897 { 1080 {
898 /* restore all saved variables and stuff */ 1081 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 1082 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 1090 POPSTACK_TO (PL_mainstack);
908 1091
909 /* unwind main stack */ 1092 /* unwind main stack */
910 dounwind (-1); 1093 dounwind (-1);
911 } 1094 }
1095}
912 1096
913 SvREFCNT_dec (GvSV (PL_defgv)); 1097static void
914 SvREFCNT_dec (GvAV (PL_defgv)); 1098destroy_perl (pTHX_ struct coro *coro)
915 SvREFCNT_dec (GvSV (PL_errgv)); 1099{
916 SvREFCNT_dec (PL_defoutgv); 1100 SV *svf [9];
917 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv));
919 1101
920 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook);
922 1102 {
1103 struct coro *current = SvSTATE_current;
1104
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106
1107 save_perl (aTHX_ current);
1108 load_perl (aTHX_ coro);
1109
1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1115
1116 // now save some sv's to be free'd later
1117 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs;
1122 svf [5] = GvSV (irsgv);
1123 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf));
1127
1128 load_perl (aTHX_ current);
1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
923 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 1138 SvREFCNT_dec (coro->rouse_cb);
925 1139 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1140 SvREFCNT_dec (coro->invoke_av);
1141 }
927} 1142}
928 1143
929INLINE void 1144INLINE void
930free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
931{ 1146{
… …
939static int 1154static int
940runops_trace (pTHX) 1155runops_trace (pTHX)
941{ 1156{
942 COP *oldcop = 0; 1157 COP *oldcop = 0;
943 int oldcxix = -2; 1158 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1159
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1161 {
949 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
950 1163
951 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1165 {
953 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)
954 { 1167 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1169 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
958 SV **cb; 1171 SV **cb;
… …
995 1208
996 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
997 { 1210 {
998 SV **cb; 1211 SV **cb;
999 1212
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1214 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1216
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1218 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1219 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1220 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1221 SV *fullname = sv_2mortal (newSV (0));
1010 1222
1011 if (isGV (gv)) 1223 if (isGV (gv))
… …
1016 SAVETMPS; 1228 SAVETMPS;
1017 EXTEND (SP, 3); 1229 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1230 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1231 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1232 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1233 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1234 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1235 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1024 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1236 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1237 SPAGAIN;
1026 FREETMPS; 1238 FREETMPS;
… …
1029 } 1241 }
1030 1242
1031 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1032 } 1244 }
1033 1245
1034 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1247 {
1036 dSP; 1248 dSP;
1037 1249
1038 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1251 ENTER;
… …
1058 1270
1059 TAINT_NOT; 1271 TAINT_NOT;
1060 return 0; 1272 return 0;
1061} 1273}
1062 1274
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1275static struct CoroSLF cctx_ssl_frame;
1065 1276
1066static void 1277static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1278slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1279{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1280 ta->prev = 0;
1071} 1281}
1072 1282
1073static int 1283static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1284slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1285{
… …
1078 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 */
1079} 1289}
1080 1290
1081/* 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 */
1082static void NOINLINE 1292static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1293cctx_prepare (pTHX)
1084{ 1294{
1085 PL_top_env = &PL_start_env; 1295 PL_top_env = &PL_start_env;
1086 1296
1087 if (cctx->flags & CC_TRACE) 1297 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1298 PL_runops = runops_trace;
1089 1299
1090 /* 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
1091 * that can lead to creation of a new cctx */ 1301 * that can lead to creation of a new cctx */
1092 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)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1303 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1304
1095 /* 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 */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1306 cctx_ssl_frame = slf_frame;
1098 1307
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1308 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1309 slf_frame.check = slf_check_set_stacklevel;
1101} 1310}
… …
1124 /* normally we would need to skip the entersub here */ 1333 /* normally we would need to skip the entersub here */
1125 /* 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 */
1126 /* PL_nop = PL_nop->op_next */ 1335 /* PL_nop = PL_nop->op_next */
1127 1336
1128 /* inject a fake subroutine call to cctx_init */ 1337 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1338 cctx_prepare (aTHX);
1130 1339
1131 /* cctx_run is the alternative tail of transfer() */ 1340 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1341 transfer_tail (aTHX);
1133 1342
1134 /* 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 */
1135 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1136 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 */
1137 1351
1138 /* 1352 /*
1139 * 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
1140 * 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)
1141 * 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
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * 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.
1144 */ 1360 */
1145 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1146 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 */
1147 } 1363 }
1148} 1364}
… …
1225cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1226{ 1442{
1227 if (!cctx) 1443 if (!cctx)
1228 return; 1444 return;
1229 1445
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1447
1230 --cctx_count; 1448 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1232 1450
1233 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1452 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1298 1516
1299 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1300 { 1518 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 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,");
1303 1521
1304 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306
1307 if (expect_false (next->flags & CF_DESTROYED)) 1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1308 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,");
1309 1524
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1312 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,");
1313#endif 1528#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1535{
1321 dSTACKLEVEL; 1536 dSTACKLEVEL;
1322 1537
1323 /* sometimes transfer is only called to set idle_sp */ 1538 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1539 if (expect_false (!prev))
1325 { 1540 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1541 cctx_current->idle_sp = STACKLEVEL;
1327 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 */
1328 } 1543 }
1329 else if (expect_true (prev != next)) 1544 else if (expect_true (prev != next))
1330 { 1545 {
1331 coro_cctx *prev__cctx; 1546 coro_cctx *cctx_prev;
1332 1547
1333 if (expect_false (prev->flags & CF_NEW)) 1548 if (expect_false (prev->flags & CF_NEW))
1334 { 1549 {
1335 /* create a new empty/source context */ 1550 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1551 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1552 prev->flags |= CF_RUNNING;
1339 } 1553 }
1340 1554
1341 prev->flags &= ~CF_RUNNING; 1555 prev->flags &= ~CF_RUNNING;
… …
1347 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1348 { 1562 {
1349 /* need to start coroutine */ 1563 /* need to start coroutine */
1350 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1351 /* setup coroutine call */ 1565 /* setup coroutine call */
1352 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1353 } 1567 }
1354 else 1568 else
1355 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1356 1570
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1572 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1575 && !force_cctx
1364 )) 1576 ))
1365 { 1577 {
1366 /* 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 */
1367 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));
1368 1580
1369 prev->cctx = 0;
1370
1371 /* 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. */
1372 /* 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 */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1583 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1584 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1585 next->cctx = cctx_get (aTHX);
1376 1586
1377 cctx_put (prev__cctx); 1587 cctx_put (cctx_current);
1378 } 1588 }
1589 else
1590 prev->cctx = cctx_current;
1379 1591
1380 ++next->usecount; 1592 ++next->usecount;
1381 1593
1382 if (expect_true (!next->cctx)) 1594 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1596
1385 if (expect_false (prev__cctx != next->cctx)) 1597 next->cctx = 0;
1598
1599 if (expect_false (cctx_prev != cctx_current))
1386 { 1600 {
1387 prev__cctx->top_env = PL_top_env; 1601 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1602 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1604 }
1391 1605
1392 transfer_tail (aTHX); 1606 transfer_tail (aTHX);
1393 } 1607 }
1394} 1608}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1617{
1404 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1405 return 0; 1619 return 0;
1406 1620
1407 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1409 1623
1410 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1411 1625
1412 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1630 --coro_nready;
1417 } 1631 }
1418 else 1632 else
1419 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 */
1420 1634
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1422 { 1636 && coro->mainstack != main_mainstack
1423 struct coro temp; 1637 && coro->slot
1424 1638 && !PL_dirty)
1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1426
1427 save_perl (aTHX_ &temp);
1428 load_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1429
1430 coro_destruct (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436
1437 cctx_destroy (coro->cctx);
1438 SvREFCNT_dec (coro->args);
1439 1640
1440 if (coro->next) coro->next->prev = coro->prev; 1641 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1642 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW);
1443 1650
1444 return 1; 1651 return 1;
1445} 1652}
1446 1653
1447static int 1654static int
… …
1502/** Coro ********************************************************************/ 1709/** Coro ********************************************************************/
1503 1710
1504INLINE void 1711INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1506{ 1713{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1508}
1509 1715
1510INLINE SV * 1716 SvREFCNT_inc_NN (coro->hv);
1717
1718 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro;
1721}
1722
1723INLINE struct coro *
1511coro_deq (pTHX) 1724coro_deq (pTHX)
1512{ 1725{
1513 int prio; 1726 int prio;
1514 1727
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1517 return av_shift (coro_ready [prio]); 1730 struct coro **ready = coro_ready [prio];
1731
1732 if (ready [0])
1733 {
1734 struct coro *coro = ready [0];
1735 ready [0] = coro->next_ready;
1736 return coro;
1737 }
1738 }
1518 1739
1519 return 0; 1740 return 0;
1741}
1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1520} 1758}
1521 1759
1522static int 1760static int
1523api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1524{ 1762{
1525 struct coro *coro;
1526 SV *sv_hook;
1527 void (*xs_hook)(void);
1528
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1533 1764
1534 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1535 return 0; 1766 return 0;
1536 1767
1537 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1538 1769
1539 sv_hook = coro_nready ? 0 : coro_readyhook;
1540 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1541
1542 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1543 ++coro_nready;
1544 1771
1545 if (sv_hook) 1772 if (!coro_nready++)
1546 { 1773 if (coroapi.readyhook)
1547 dSP; 1774 coroapi.readyhook ();
1548
1549 ENTER;
1550 SAVETMPS;
1551
1552 PUSHMARK (SP);
1553 PUTBACK;
1554 call_sv (sv_hook, G_VOID | G_DISCARD);
1555
1556 FREETMPS;
1557 LEAVE;
1558 }
1559
1560 if (xs_hook)
1561 xs_hook ();
1562 1775
1563 return 1; 1776 return 1;
1564} 1777}
1565 1778
1566static int 1779static int
1567api_is_ready (pTHX_ SV *coro_sv) 1780api_is_ready (pTHX_ SV *coro_sv)
1568{ 1781{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1782 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1783}
1571 1784
1785/* expects to own a reference to next->hv */
1572INLINE void 1786INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1788{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1789 SV *prev_sv = SvRV (coro_current);
1790
1614 ta->prev = SvSTATE_hv (prev_sv); 1791 ta->prev = SvSTATE_hv (prev_sv);
1792 ta->next = next;
1793
1615 TRANSFER_CHECK (*ta); 1794 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1795
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1796 SvRV_set (coro_current, (SV *)next->hv);
1619 1797
1620 free_coro_mortal (aTHX); 1798 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1799 coro_mortal = prev_sv;
1622} 1800}
1623 1801
1802static void
1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1804{
1805 for (;;)
1806 {
1807 struct coro *next = coro_deq (aTHX);
1808
1809 if (expect_true (next))
1810 {
1811 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else
1815 {
1816 next->flags &= ~CF_READY;
1817 --coro_nready;
1818
1819 prepare_schedule_to (aTHX_ ta, next);
1820 break;
1821 }
1822 }
1823 else
1824 {
1825 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle)))
1828 {
1829 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1830 api_ready (aTHX_ SvRV (sv_idle));
1831 --coro_nready;
1832 }
1833 else
1834 {
1835 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1836 dSP;
1837
1838 ENTER;
1839 SAVETMPS;
1840
1841 PUSHMARK (SP);
1842 PUTBACK;
1843 call_sv (sv_idle, G_VOID | G_DISCARD);
1844
1845 FREETMPS;
1846 LEAVE;
1847 }
1848 }
1849 }
1850}
1851
1624INLINE void 1852INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1853prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1854{
1627 api_ready (aTHX_ coro_current); 1855 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1856 prepare_schedule (aTHX_ ta);
… …
1647{ 1875{
1648 struct coro_transfer_args ta; 1876 struct coro_transfer_args ta;
1649 1877
1650 prepare_schedule (aTHX_ &ta); 1878 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1879 TRANSFER (ta, 1);
1880}
1881
1882static void
1883api_schedule_to (pTHX_ SV *coro_sv)
1884{
1885 struct coro_transfer_args ta;
1886 struct coro *next = SvSTATE (coro_sv);
1887
1888 SvREFCNT_inc_NN (coro_sv);
1889 prepare_schedule_to (aTHX_ &ta, next);
1652} 1890}
1653 1891
1654static int 1892static int
1655api_cede (pTHX) 1893api_cede (pTHX)
1656{ 1894{
… …
1685static void 1923static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1924api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1925{
1688 struct coro *coro = SvSTATE (coro_sv); 1926 struct coro *coro = SvSTATE (coro_sv);
1689 1927
1928 if (coro->flags & CF_RUNNING)
1929 croak ("cannot enable tracing on a running coroutine, caught");
1930
1690 if (flags & CC_TRACE) 1931 if (flags & CC_TRACE)
1691 { 1932 {
1692 if (!coro->cctx) 1933 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1934 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1935 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1936 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1937
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1938 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1939 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1940 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1941 {
… …
1703 if (coro->flags & CF_RUNNING) 1944 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1945 PL_runops = RUNOPS_DEFAULT;
1705 else 1946 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1947 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1948 }
1949}
1950
1951static void
1952coro_call_on_destroy (pTHX_ struct coro *coro)
1953{
1954 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1955 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1956
1957 if (on_destroyp)
1958 {
1959 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1960
1961 while (AvFILLp (on_destroy) >= 0)
1962 {
1963 dSP; /* don't disturb outer sp */
1964 SV *cb = av_pop (on_destroy);
1965
1966 PUSHMARK (SP);
1967
1968 if (statusp)
1969 {
1970 int i;
1971 AV *status = (AV *)SvRV (*statusp);
1972 EXTEND (SP, AvFILLp (status) + 1);
1973
1974 for (i = 0; i <= AvFILLp (status); ++i)
1975 PUSHs (AvARRAY (status)[i]);
1976 }
1977
1978 PUTBACK;
1979 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1980 }
1981 }
1982}
1983
1984static void
1985slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1986{
1987 int i;
1988 HV *hv = (HV *)SvRV (coro_current);
1989 AV *av = newAV ();
1990
1991 /* items are actually not so common, so optimise for this case */
1992 if (items)
1993 {
1994 av_extend (av, items - 1);
1995
1996 for (i = 0; i < items; ++i)
1997 av_push (av, SvREFCNT_inc_NN (arg [i]));
1998 }
1999
2000 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2001
2002 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2003 api_ready (aTHX_ sv_manager);
2004
2005 frame->prepare = prepare_schedule;
2006 frame->check = slf_check_repeat;
2007
2008 /* as a minor optimisation, we could unwind all stacks here */
2009 /* but that puts extra pressure on pp_slf, and is not worth much */
2010 /*coro_unwind_stacks (aTHX);*/
2011}
2012
2013/*****************************************************************************/
2014/* async pool handler */
2015
2016static int
2017slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2018{
2019 HV *hv = (HV *)SvRV (coro_current);
2020 struct coro *coro = (struct coro *)frame->data;
2021
2022 if (!coro->invoke_cb)
2023 return 1; /* loop till we have invoke */
2024 else
2025 {
2026 hv_store (hv, "desc", sizeof ("desc") - 1,
2027 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2028
2029 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2030
2031 {
2032 dSP;
2033 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2034 PUTBACK;
2035 }
2036
2037 SvREFCNT_dec (GvAV (PL_defgv));
2038 GvAV (PL_defgv) = coro->invoke_av;
2039 coro->invoke_av = 0;
2040
2041 return 0;
2042 }
2043}
2044
2045static void
2046slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2047{
2048 HV *hv = (HV *)SvRV (coro_current);
2049 struct coro *coro = SvSTATE_hv ((SV *)hv);
2050
2051 if (expect_true (coro->saved_deffh))
2052 {
2053 /* subsequent iteration */
2054 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2055 coro->saved_deffh = 0;
2056
2057 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2058 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2059 {
2060 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2061 coro->invoke_av = newAV ();
2062
2063 frame->prepare = prepare_nop;
2064 }
2065 else
2066 {
2067 av_clear (GvAV (PL_defgv));
2068 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2069
2070 coro->prio = 0;
2071
2072 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2073 api_trace (aTHX_ coro_current, 0);
2074
2075 frame->prepare = prepare_schedule;
2076 av_push (av_async_pool, SvREFCNT_inc (hv));
2077 }
2078 }
2079 else
2080 {
2081 /* first iteration, simply fall through */
2082 frame->prepare = prepare_nop;
2083 }
2084
2085 frame->check = slf_check_pool_handler;
2086 frame->data = (void *)coro;
2087}
2088
2089/*****************************************************************************/
2090/* rouse callback */
2091
2092#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2093
2094static void
2095coro_rouse_callback (pTHX_ CV *cv)
2096{
2097 dXSARGS;
2098 SV *data = (SV *)S_GENSUB_ARG;
2099
2100 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2101 {
2102 /* first call, set args */
2103 SV *coro = SvRV (data);
2104 AV *av = newAV ();
2105
2106 SvRV_set (data, (SV *)av);
2107
2108 /* better take a full copy of the arguments */
2109 while (items--)
2110 av_store (av, items, newSVsv (ST (items)));
2111
2112 api_ready (aTHX_ coro);
2113 SvREFCNT_dec (coro);
2114 }
2115
2116 XSRETURN_EMPTY;
2117}
2118
2119static int
2120slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2121{
2122 SV *data = (SV *)frame->data;
2123
2124 if (CORO_THROW)
2125 return 0;
2126
2127 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2128 return 1;
2129
2130 /* now push all results on the stack */
2131 {
2132 dSP;
2133 AV *av = (AV *)SvRV (data);
2134 int i;
2135
2136 EXTEND (SP, AvFILLp (av) + 1);
2137 for (i = 0; i <= AvFILLp (av); ++i)
2138 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2139
2140 /* we have stolen the elements, so set length to zero and free */
2141 AvFILLp (av) = -1;
2142 av_undef (av);
2143
2144 PUTBACK;
2145 }
2146
2147 return 0;
2148}
2149
2150static void
2151slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2152{
2153 SV *cb;
2154
2155 if (items)
2156 cb = arg [0];
2157 else
2158 {
2159 struct coro *coro = SvSTATE_current;
2160
2161 if (!coro->rouse_cb)
2162 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2163
2164 cb = sv_2mortal (coro->rouse_cb);
2165 coro->rouse_cb = 0;
2166 }
2167
2168 if (!SvROK (cb)
2169 || SvTYPE (SvRV (cb)) != SVt_PVCV
2170 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2171 croak ("Coro::rouse_wait called with illegal callback argument,");
2172
2173 {
2174 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2175 SV *data = (SV *)S_GENSUB_ARG;
2176
2177 frame->data = (void *)data;
2178 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2179 frame->check = slf_check_rouse_wait;
2180 }
2181}
2182
2183static SV *
2184coro_new_rouse_cb (pTHX)
2185{
2186 HV *hv = (HV *)SvRV (coro_current);
2187 struct coro *coro = SvSTATE_hv (hv);
2188 SV *data = newRV_inc ((SV *)hv);
2189 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2190
2191 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2192 SvREFCNT_dec (data); /* magicext increases the refcount */
2193
2194 SvREFCNT_dec (coro->rouse_cb);
2195 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2196
2197 return cb;
1708} 2198}
1709 2199
1710/*****************************************************************************/ 2200/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2201/* schedule-like-function opcode (SLF) */
1712 2202
… …
1759static void 2249static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2250slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2251{
1762 frame->prepare = prepare_schedule; 2252 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2253 frame->check = slf_check_nop;
2254}
2255
2256static void
2257slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2258{
2259 struct coro *next = (struct coro *)slf_frame.data;
2260
2261 SvREFCNT_inc_NN (next->hv);
2262 prepare_schedule_to (aTHX_ ta, next);
2263}
2264
2265static void
2266slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2267{
2268 if (!items)
2269 croak ("Coro::schedule_to expects a coroutine argument, caught");
2270
2271 frame->data = (void *)SvSTATE (arg [0]);
2272 frame->prepare = slf_prepare_schedule_to;
2273 frame->check = slf_check_nop;
2274}
2275
2276static void
2277slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2278{
2279 api_ready (aTHX_ SvRV (coro_current));
2280
2281 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2282}
1765 2283
1766static void 2284static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2285slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2286{
… …
1914 } 2432 }
1915 else 2433 else
1916 slf_argc = 0; 2434 slf_argc = 0;
1917 2435
1918 PL_op->op_ppaddr = pp_slf; 2436 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2437 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2438
1921 PL_op = (OP *)&slf_restore; 2439 PL_op = (OP *)&slf_restore;
2440}
2441
2442/*****************************************************************************/
2443/* dynamic wind */
2444
2445static void
2446on_enterleave_call (pTHX_ SV *cb)
2447{
2448 dSP;
2449
2450 PUSHSTACK;
2451
2452 PUSHMARK (SP);
2453 PUTBACK;
2454 call_sv (cb, G_VOID | G_DISCARD);
2455 SPAGAIN;
2456
2457 POPSTACK;
2458}
2459
2460static SV *
2461coro_avp_pop_and_free (pTHX_ AV **avp)
2462{
2463 AV *av = *avp;
2464 SV *res = av_pop (av);
2465
2466 if (AvFILLp (av) < 0)
2467 {
2468 *avp = 0;
2469 SvREFCNT_dec (av);
2470 }
2471
2472 return res;
2473}
2474
2475static void
2476coro_pop_on_enter (pTHX_ void *coro)
2477{
2478 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2479 SvREFCNT_dec (cb);
2480}
2481
2482static void
2483coro_pop_on_leave (pTHX_ void *coro)
2484{
2485 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2486 on_enterleave_call (aTHX_ sv_2mortal (cb));
1922} 2487}
1923 2488
1924/*****************************************************************************/ 2489/*****************************************************************************/
1925/* PerlIO::cede */ 2490/* PerlIO::cede */
1926 2491
… …
2000/* Coro::Semaphore & Coro::Signal */ 2565/* Coro::Semaphore & Coro::Signal */
2001 2566
2002static SV * 2567static SV *
2003coro_waitarray_new (pTHX_ int count) 2568coro_waitarray_new (pTHX_ int count)
2004{ 2569{
2005 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2570 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2006 AV *av = newAV (); 2571 AV *av = newAV ();
2007 SV **ary; 2572 SV **ary;
2008 2573
2009 /* unfortunately, building manually saves memory */ 2574 /* unfortunately, building manually saves memory */
2010 Newx (ary, 2, SV *); 2575 Newx (ary, 2, SV *);
2011 AvALLOC (av) = ary; 2576 AvALLOC (av) = ary;
2577#if PERL_VERSION_ATLEAST (5,10,0)
2012 AvARRAY (av) = ary; 2578 AvARRAY (av) = ary;
2579#else
2580 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2581 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2582 SvPVX ((SV *)av) = (char *)ary;
2583#endif
2013 AvMAX (av) = 1; 2584 AvMAX (av) = 1;
2014 AvFILLp (av) = 0; 2585 AvFILLp (av) = 0;
2015 ary [0] = newSViv (count); 2586 ary [0] = newSViv (count);
2016 2587
2017 return newRV_noinc ((SV *)av); 2588 return newRV_noinc ((SV *)av);
… …
2037 AvARRAY (av)[0] = AvARRAY (av)[1]; 2608 AvARRAY (av)[0] = AvARRAY (av)[1];
2038 AvARRAY (av)[1] = count_sv; 2609 AvARRAY (av)[1] = count_sv;
2039 cb = av_shift (av); 2610 cb = av_shift (av);
2040 2611
2041 if (SvOBJECT (cb)) 2612 if (SvOBJECT (cb))
2613 {
2042 api_ready (aTHX_ cb); 2614 api_ready (aTHX_ cb);
2043 else 2615 --count;
2044 croak ("callbacks not yet supported"); 2616 }
2617 else if (SvTYPE (cb) == SVt_PVCV)
2618 {
2619 dSP;
2620 PUSHMARK (SP);
2621 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2622 PUTBACK;
2623 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2624 }
2045 2625
2046 SvREFCNT_dec (cb); 2626 SvREFCNT_dec (cb);
2047
2048 --count;
2049 } 2627 }
2050} 2628}
2051 2629
2052static void 2630static void
2053coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2631coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2135} 2713}
2136 2714
2137static void 2715static void
2138slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2716slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2139{ 2717{
2718 if (items >= 2)
2719 {
2720 /* callback form */
2721 AV *av = (AV *)SvRV (arg [0]);
2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2723
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2726 if (SvIVX (AvARRAY (av)[0]) > 0)
2727 coro_semaphore_adjust (aTHX_ av, 0);
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else
2733 {
2140 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2734 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2141 frame->check = slf_check_semaphore_wait; 2735 frame->check = slf_check_semaphore_wait;
2736 }
2142} 2737}
2143 2738
2144/* signal */ 2739/* signal */
2145 2740
2146static void 2741static void
… …
2158 AvARRAY (av)[0] = AvARRAY (av)[1]; 2753 AvARRAY (av)[0] = AvARRAY (av)[1];
2159 AvARRAY (av)[1] = cb; 2754 AvARRAY (av)[1] = cb;
2160 2755
2161 cb = av_shift (av); 2756 cb = av_shift (av);
2162 2757
2758 if (SvTYPE (cb) == SVt_PVCV)
2759 {
2760 dSP;
2761 PUSHMARK (SP);
2762 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2763 PUTBACK;
2764 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2765 }
2766 else
2767 {
2163 api_ready (aTHX_ cb); 2768 api_ready (aTHX_ cb);
2164 sv_setiv (cb, 0); /* signal waiter */ 2769 sv_setiv (cb, 0); /* signal waiter */
2770 }
2771
2165 SvREFCNT_dec (cb); 2772 SvREFCNT_dec (cb);
2166 2773
2167 --count; 2774 --count;
2168 } 2775 }
2169} 2776}
… …
2178static void 2785static void
2179slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2786slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2180{ 2787{
2181 AV *av = (AV *)SvRV (arg [0]); 2788 AV *av = (AV *)SvRV (arg [0]);
2182 2789
2790 if (items >= 2)
2791 {
2792 SV *cb_cv = s_get_cv_croak (arg [1]);
2793 av_push (av, SvREFCNT_inc_NN (cb_cv));
2794
2183 if (SvIVX (AvARRAY (av)[0])) 2795 if (SvIVX (AvARRAY (av)[0]))
2796 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2797
2798 frame->prepare = prepare_nop;
2799 frame->check = slf_check_nop;
2800 }
2801 else if (SvIVX (AvARRAY (av)[0]))
2184 { 2802 {
2185 SvIVX (AvARRAY (av)[0]) = 0; 2803 SvIVX (AvARRAY (av)[0]) = 0;
2186 frame->prepare = prepare_nop; 2804 frame->prepare = prepare_nop;
2187 frame->check = slf_check_nop; 2805 frame->check = slf_check_nop;
2188 } 2806 }
2189 else 2807 else
2190 { 2808 {
2191 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2809 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2192 2810
2193 av_push (av, waiter); 2811 av_push (av, waiter);
2194 2812
2195 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2813 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2196 frame->prepare = prepare_schedule; 2814 frame->prepare = prepare_schedule;
2197 frame->check = slf_check_signal_wait; 2815 frame->check = slf_check_signal_wait;
2198 } 2816 }
2199}
2200
2201/*****************************************************************************/
2202/* gensub: simple closure generation utility */
2203
2204#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2205
2206/* create a closure from XS, returns a code reference */
2207/* the arg can be accessed via GENSUB_ARG from the callback */
2208/* the callback must use dXSARGS/XSRETURN */
2209static SV *
2210gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2211{
2212 CV *cv = (CV *)newSV (0);
2213
2214 sv_upgrade ((SV *)cv, SVt_PVCV);
2215
2216 CvANON_on (cv);
2217 CvISXSUB_on (cv);
2218 CvXSUB (cv) = xsub;
2219 GENSUB_ARG = arg;
2220
2221 return newRV_noinc ((SV *)cv);
2222} 2817}
2223 2818
2224/*****************************************************************************/ 2819/*****************************************************************************/
2225/* Coro::AIO */ 2820/* Coro::AIO */
2226 2821
… …
2237 2832
2238static void 2833static void
2239coro_aio_callback (pTHX_ CV *cv) 2834coro_aio_callback (pTHX_ CV *cv)
2240{ 2835{
2241 dXSARGS; 2836 dXSARGS;
2242 AV *state = (AV *)GENSUB_ARG; 2837 AV *state = (AV *)S_GENSUB_ARG;
2243 SV *coro = av_pop (state); 2838 SV *coro = av_pop (state);
2244 SV *data_sv = newSV (sizeof (struct io_state)); 2839 SV *data_sv = newSV (sizeof (struct io_state));
2245 2840
2246 av_extend (state, items); 2841 av_extend (state, items - 1);
2247 2842
2248 sv_upgrade (data_sv, SVt_PV); 2843 sv_upgrade (data_sv, SVt_PV);
2249 SvCUR_set (data_sv, sizeof (struct io_state)); 2844 SvCUR_set (data_sv, sizeof (struct io_state));
2250 SvPOK_only (data_sv); 2845 SvPOK_only (data_sv);
2251 2846
… …
2361 2956
2362 for (i = 0; i < items; ++i) 2957 for (i = 0; i < items; ++i)
2363 PUSHs (arg [i]); 2958 PUSHs (arg [i]);
2364 2959
2365 /* now push the callback closure */ 2960 /* now push the callback closure */
2366 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2961 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2367 2962
2368 /* now call the AIO function - we assume our request is uncancelable */ 2963 /* now call the AIO function - we assume our request is uncancelable */
2369 PUTBACK; 2964 PUTBACK;
2370 call_sv ((SV *)req, G_VOID | G_DISCARD); 2965 call_sv ((SV *)req, G_VOID | G_DISCARD);
2371 } 2966 }
… …
2385 2980
2386 XSRETURN_EMPTY; 2981 XSRETURN_EMPTY;
2387} 2982}
2388 2983
2389/*****************************************************************************/ 2984/*****************************************************************************/
2985
2986#if CORO_CLONE
2987# include "clone.c"
2988#endif
2989
2990/*****************************************************************************/
2991
2992static SV *
2993coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2994{
2995 SV *coro_sv;
2996 struct coro *coro;
2997 MAGIC *mg;
2998 HV *hv;
2999 SV *cb;
3000 int i;
3001
3002 if (argc > 0)
3003 {
3004 cb = s_get_cv_croak (argv [0]);
3005
3006 if (!is_coro)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
3015
3016 Newz (0, coro, 1, struct coro);
3017 coro->args = newAV ();
3018 coro->flags = CF_NEW;
3019
3020 if (coro_first) coro_first->prev = coro;
3021 coro->next = coro_first;
3022 coro_first = coro;
3023
3024 coro->hv = hv = newHV ();
3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3026 mg->mg_flags |= MGf_DUP;
3027 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3028
3029 if (argc > 0)
3030 {
3031 av_extend (coro->args, argc + is_coro - 1);
3032
3033 if (is_coro)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
3041 for (i = 1; i < argc; i++)
3042 av_push (coro->args, newSVsv (argv [i]));
3043 }
3044
3045 return coro_sv;
3046}
2390 3047
2391MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3048MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2392 3049
2393PROTOTYPES: DISABLE 3050PROTOTYPES: DISABLE
2394 3051
… …
2399 coro_thx = PERL_GET_CONTEXT; 3056 coro_thx = PERL_GET_CONTEXT;
2400# endif 3057# endif
2401#endif 3058#endif
2402 BOOT_PAGESIZE; 3059 BOOT_PAGESIZE;
2403 3060
3061 cctx_current = cctx_new_empty ();
3062
2404 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3063 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2405 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3064 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2406 3065
2407 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3066 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2408 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3067 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2427 3086
2428 { 3087 {
2429 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3088 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2430 3089
2431 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3090 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2432 hv_store_ent (PL_custom_op_names, slf, 3091 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2433 newSVpv ("coro_slf", 0), 0);
2434 3092
2435 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3093 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2436 hv_store_ent (PL_custom_op_descs, slf, 3094 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2437 newSVpv ("coro schedule like function", 0), 0);
2438 } 3095 }
2439 3096
2440 coroapi.ver = CORO_API_VERSION; 3097 coroapi.ver = CORO_API_VERSION;
2441 coroapi.rev = CORO_API_REVISION; 3098 coroapi.rev = CORO_API_REVISION;
2442 3099
… …
2454 3111
2455 if (!svp) croak ("Time::HiRes is required"); 3112 if (!svp) croak ("Time::HiRes is required");
2456 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3113 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2457 3114
2458 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3115 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3116
3117 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3118 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2459 } 3119 }
2460 3120
2461 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3121 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2462} 3122}
2463 3123
2464SV * 3124SV *
2465new (char *klass, ...) 3125new (SV *klass, ...)
3126 ALIAS:
3127 Coro::new = 1
2466 CODE: 3128 CODE:
2467{ 3129 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2468 struct coro *coro; 3130 OUTPUT:
2469 MAGIC *mg;
2470 HV *hv;
2471 int i;
2472
2473 Newz (0, coro, 1, struct coro);
2474 coro->args = newAV ();
2475 coro->flags = CF_NEW;
2476
2477 if (coro_first) coro_first->prev = coro;
2478 coro->next = coro_first;
2479 coro_first = coro;
2480
2481 coro->hv = hv = newHV ();
2482 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2483 mg->mg_flags |= MGf_DUP;
2484 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2485
2486 av_extend (coro->args, items - 1);
2487 for (i = 1; i < items; i++)
2488 av_push (coro->args, newSVsv (ST (i)));
2489}
2490 OUTPUT:
2491 RETVAL 3131 RETVAL
2492 3132
2493void 3133void
2494transfer (...) 3134transfer (...)
2495 PROTOTYPE: $$ 3135 PROTOTYPE: $$
… …
2506void 3146void
2507_exit (int code) 3147_exit (int code)
2508 PROTOTYPE: $ 3148 PROTOTYPE: $
2509 CODE: 3149 CODE:
2510 _exit (code); 3150 _exit (code);
3151
3152SV *
3153clone (Coro::State coro)
3154 CODE:
3155{
3156#if CORO_CLONE
3157 struct coro *ncoro = coro_clone (aTHX_ coro);
3158 MAGIC *mg;
3159 /* TODO: too much duplication */
3160 ncoro->hv = newHV ();
3161 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3162 mg->mg_flags |= MGf_DUP;
3163 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3164#else
3165 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3166#endif
3167}
3168 OUTPUT:
3169 RETVAL
2511 3170
2512int 3171int
2513cctx_stacksize (int new_stacksize = 0) 3172cctx_stacksize (int new_stacksize = 0)
2514 PROTOTYPE: ;$ 3173 PROTOTYPE: ;$
2515 CODE: 3174 CODE:
… …
2565 eval = 1 3224 eval = 1
2566 CODE: 3225 CODE:
2567{ 3226{
2568 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3227 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2569 { 3228 {
2570 struct coro temp; 3229 struct coro *current = SvSTATE_current;
2571 3230
2572 if (!(coro->flags & CF_RUNNING)) 3231 if (current != coro)
2573 { 3232 {
2574 PUTBACK; 3233 PUTBACK;
2575 save_perl (aTHX_ &temp); 3234 save_perl (aTHX_ current);
2576 load_perl (aTHX_ coro); 3235 load_perl (aTHX_ coro);
3236 SPAGAIN;
2577 } 3237 }
2578 3238
2579 {
2580 dSP;
2581 ENTER;
2582 SAVETMPS;
2583 PUTBACK;
2584 PUSHSTACK; 3239 PUSHSTACK;
3240
2585 PUSHMARK (SP); 3241 PUSHMARK (SP);
3242 PUTBACK;
2586 3243
2587 if (ix) 3244 if (ix)
2588 eval_sv (coderef, 0); 3245 eval_sv (coderef, 0);
2589 else 3246 else
2590 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3247 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2591 3248
2592 POPSTACK; 3249 POPSTACK;
2593 SPAGAIN; 3250 SPAGAIN;
2594 FREETMPS;
2595 LEAVE;
2596 PUTBACK;
2597 }
2598 3251
2599 if (!(coro->flags & CF_RUNNING)) 3252 if (current != coro)
2600 { 3253 {
3254 PUTBACK;
2601 save_perl (aTHX_ coro); 3255 save_perl (aTHX_ coro);
2602 load_perl (aTHX_ &temp); 3256 load_perl (aTHX_ current);
2603 SPAGAIN; 3257 SPAGAIN;
2604 } 3258 }
2605 } 3259 }
2606} 3260}
2607 3261
… …
2611 ALIAS: 3265 ALIAS:
2612 is_ready = CF_READY 3266 is_ready = CF_READY
2613 is_running = CF_RUNNING 3267 is_running = CF_RUNNING
2614 is_new = CF_NEW 3268 is_new = CF_NEW
2615 is_destroyed = CF_DESTROYED 3269 is_destroyed = CF_DESTROYED
3270 is_suspended = CF_SUSPENDED
2616 CODE: 3271 CODE:
2617 RETVAL = boolSV (coro->flags & ix); 3272 RETVAL = boolSV (coro->flags & ix);
2618 OUTPUT: 3273 OUTPUT:
2619 RETVAL 3274 RETVAL
2620 3275
… …
2624 CODE: 3279 CODE:
2625{ 3280{
2626 struct coro *current = SvSTATE_current; 3281 struct coro *current = SvSTATE_current;
2627 SV **throwp = self == current ? &CORO_THROW : &self->except; 3282 SV **throwp = self == current ? &CORO_THROW : &self->except;
2628 SvREFCNT_dec (*throwp); 3283 SvREFCNT_dec (*throwp);
3284 SvGETMAGIC (throw);
2629 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3285 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2630} 3286}
2631 3287
2632void 3288void
2633api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3289api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2636 3292
2637SV * 3293SV *
2638has_cctx (Coro::State coro) 3294has_cctx (Coro::State coro)
2639 PROTOTYPE: $ 3295 PROTOTYPE: $
2640 CODE: 3296 CODE:
2641 RETVAL = boolSV (!!coro->cctx); 3297 /* maybe manage the running flag differently */
3298 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2642 OUTPUT: 3299 OUTPUT:
2643 RETVAL 3300 RETVAL
2644 3301
2645int 3302int
2646is_traced (Coro::State coro) 3303is_traced (Coro::State coro)
… …
2666 3323
2667void 3324void
2668force_cctx () 3325force_cctx ()
2669 PROTOTYPE: 3326 PROTOTYPE:
2670 CODE: 3327 CODE:
2671 SvSTATE_current->cctx->idle_sp = 0; 3328 cctx_current->idle_sp = 0;
2672 3329
2673void 3330void
2674swap_defsv (Coro::State self) 3331swap_defsv (Coro::State self)
2675 PROTOTYPE: $ 3332 PROTOTYPE: $
2676 ALIAS: 3333 ALIAS:
… …
2684 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3341 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2685 3342
2686 SV *tmp = *src; *src = *dst; *dst = tmp; 3343 SV *tmp = *src; *src = *dst; *dst = tmp;
2687 } 3344 }
2688 3345
3346void
3347cancel (Coro::State self)
3348 CODE:
3349 coro_state_destroy (aTHX_ self);
3350 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3351
3352
3353SV *
3354enable_times (int enabled = enable_times)
3355 CODE:
3356{
3357 RETVAL = boolSV (enable_times);
3358
3359 if (enabled != enable_times)
3360 {
3361 enable_times = enabled;
3362
3363 coro_times_update ();
3364 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3365 }
3366}
3367 OUTPUT:
3368 RETVAL
3369
3370void
3371times (Coro::State self)
3372 PPCODE:
3373{
3374 struct coro *current = SvSTATE (coro_current);
3375
3376 if (expect_false (current == self))
3377 {
3378 coro_times_update ();
3379 coro_times_add (SvSTATE (coro_current));
3380 }
3381
3382 EXTEND (SP, 2);
3383 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3384 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3385
3386 if (expect_false (current == self))
3387 coro_times_sub (SvSTATE (coro_current));
3388}
3389
3390void
3391swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3392 CODE:
3393{
3394 struct coro *current = SvSTATE_current;
3395
3396 if (current == coro)
3397 SWAP_SVS (current);
3398
3399 if (!coro->swap_sv)
3400 coro->swap_sv = newAV ();
3401
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3403 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3404
3405 if (current == coro)
3406 SWAP_SVS (current);
3407}
3408
2689 3409
2690MODULE = Coro::State PACKAGE = Coro 3410MODULE = Coro::State PACKAGE = Coro
2691 3411
2692BOOT: 3412BOOT:
2693{ 3413{
2694 int i;
2695
2696 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3414 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3415 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2699 3416 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3417 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2700 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3418 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2701 SvREADONLY_on (coro_current); 3419 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3420 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3421 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3422 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2702 3423
3424 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3425 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3426 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3427 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3428
2703 coro_stash = gv_stashpv ("Coro", TRUE); 3429 coro_stash = gv_stashpv ("Coro", TRUE);
2704 3430
2705 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3431 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2706 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3432 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2707 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3433 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2708 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3434 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2709 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3435 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2710 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3436 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2711
2712 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2713 coro_ready[i] = newAV ();
2714 3437
2715 { 3438 {
2716 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3439 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2717 3440
2718 coroapi.schedule = api_schedule; 3441 coroapi.schedule = api_schedule;
3442 coroapi.schedule_to = api_schedule_to;
2719 coroapi.cede = api_cede; 3443 coroapi.cede = api_cede;
2720 coroapi.cede_notself = api_cede_notself; 3444 coroapi.cede_notself = api_cede_notself;
2721 coroapi.ready = api_ready; 3445 coroapi.ready = api_ready;
2722 coroapi.is_ready = api_is_ready; 3446 coroapi.is_ready = api_is_ready;
2723 coroapi.nready = coro_nready; 3447 coroapi.nready = coro_nready;
… …
2727 sv_setiv (sv, (IV)&coroapi); 3451 sv_setiv (sv, (IV)&coroapi);
2728 SvREADONLY_on (sv); 3452 SvREADONLY_on (sv);
2729 } 3453 }
2730} 3454}
2731 3455
3456SV *
3457async (...)
3458 PROTOTYPE: &@
3459 CODE:
3460 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3461 api_ready (aTHX_ RETVAL);
3462 OUTPUT:
3463 RETVAL
3464
3465void
3466terminate (...)
3467 CODE:
3468 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3469
2732void 3470void
2733schedule (...) 3471schedule (...)
2734 CODE: 3472 CODE:
2735 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3473 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3474
3475void
3476schedule_to (...)
3477 CODE:
3478 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3479
3480void
3481cede_to (...)
3482 CODE:
3483 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2736 3484
2737void 3485void
2738cede (...) 3486cede (...)
2739 CODE: 3487 CODE:
2740 CORO_EXECUTE_SLF_XS (slf_init_cede); 3488 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2754void 3502void
2755_set_readyhook (SV *hook) 3503_set_readyhook (SV *hook)
2756 PROTOTYPE: $ 3504 PROTOTYPE: $
2757 CODE: 3505 CODE:
2758 SvREFCNT_dec (coro_readyhook); 3506 SvREFCNT_dec (coro_readyhook);
3507 SvGETMAGIC (hook);
3508 if (SvOK (hook))
3509 {
2759 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3510 coro_readyhook = newSVsv (hook);
3511 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3512 }
3513 else
3514 {
3515 coro_readyhook = 0;
3516 CORO_READYHOOK = 0;
3517 }
2760 3518
2761int 3519int
2762prio (Coro::State coro, int newprio = 0) 3520prio (Coro::State coro, int newprio = 0)
2763 PROTOTYPE: $;$ 3521 PROTOTYPE: $;$
2764 ALIAS: 3522 ALIAS:
… …
2770 if (items > 1) 3528 if (items > 1)
2771 { 3529 {
2772 if (ix) 3530 if (ix)
2773 newprio = coro->prio - newprio; 3531 newprio = coro->prio - newprio;
2774 3532
2775 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3533 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2776 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3534 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2777 3535
2778 coro->prio = newprio; 3536 coro->prio = newprio;
2779 } 3537 }
2780} 3538}
2781 OUTPUT: 3539 OUTPUT:
… …
2795 CODE: 3553 CODE:
2796 RETVAL = coro_nready; 3554 RETVAL = coro_nready;
2797 OUTPUT: 3555 OUTPUT:
2798 RETVAL 3556 RETVAL
2799 3557
2800# for async_pool speedup
2801void 3558void
2802_pool_1 (SV *cb) 3559suspend (Coro::State self)
3560 PROTOTYPE: $
2803 CODE: 3561 CODE:
2804{ 3562 self->flags |= CF_SUSPENDED;
2805 HV *hv = (HV *)SvRV (coro_current);
2806 struct coro *coro = SvSTATE_hv ((SV *)hv);
2807 AV *defav = GvAV (PL_defgv);
2808 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2809 AV *invoke_av;
2810 int i, len;
2811 3563
2812 if (!invoke) 3564void
3565resume (Coro::State self)
3566 PROTOTYPE: $
3567 CODE:
3568 self->flags &= ~CF_SUSPENDED;
3569
3570void
3571_pool_handler (...)
3572 CODE:
3573 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3574
3575void
3576async_pool (SV *cv, ...)
3577 PROTOTYPE: &@
3578 PPCODE:
3579{
3580 HV *hv = (HV *)av_pop (av_async_pool);
3581 AV *av = newAV ();
3582 SV *cb = ST (0);
3583 int i;
3584
3585 av_extend (av, items - 2);
3586 for (i = 1; i < items; ++i)
3587 av_push (av, SvREFCNT_inc_NN (ST (i)));
3588
3589 if ((SV *)hv == &PL_sv_undef)
2813 { 3590 {
2814 SV *old = PL_diehook; 3591 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2815 PL_diehook = 0; 3592 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2816 SvREFCNT_dec (old); 3593 SvREFCNT_dec (sv);
2817 croak ("\3async_pool terminate\2\n");
2818 } 3594 }
2819 3595
2820 SvREFCNT_dec (coro->saved_deffh);
2821 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2822
2823 hv_store (hv, "desc", sizeof ("desc") - 1,
2824 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2825
2826 invoke_av = (AV *)SvRV (invoke);
2827 len = av_len (invoke_av);
2828
2829 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2830
2831 if (len > 0)
2832 { 3596 {
2833 av_fill (defav, len - 1); 3597 struct coro *coro = SvSTATE_hv (hv);
2834 for (i = 0; i < len; ++i) 3598
2835 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3599 assert (!coro->invoke_cb);
3600 assert (!coro->invoke_av);
3601 coro->invoke_cb = SvREFCNT_inc (cb);
3602 coro->invoke_av = av;
2836 } 3603 }
3604
3605 api_ready (aTHX_ (SV *)hv);
3606
3607 if (GIMME_V != G_VOID)
3608 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3609 else
3610 SvREFCNT_dec (hv);
2837} 3611}
3612
3613SV *
3614rouse_cb ()
3615 PROTOTYPE:
3616 CODE:
3617 RETVAL = coro_new_rouse_cb (aTHX);
3618 OUTPUT:
3619 RETVAL
2838 3620
2839void 3621void
2840_pool_2 (SV *cb) 3622rouse_wait (...)
3623 PROTOTYPE: ;$
3624 PPCODE:
3625 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3626
3627void
3628on_enter (SV *block)
3629 ALIAS:
3630 on_leave = 1
3631 PROTOTYPE: &
2841 CODE: 3632 CODE:
2842{ 3633{
2843 HV *hv = (HV *)SvRV (coro_current);
2844 struct coro *coro = SvSTATE_hv ((SV *)hv); 3634 struct coro *coro = SvSTATE_current;
3635 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2845 3636
2846 sv_setsv (cb, &PL_sv_undef); 3637 block = s_get_cv_croak (block);
2847 3638
2848 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3639 if (!*avp)
2849 coro->saved_deffh = 0; 3640 *avp = newAV ();
2850 3641
2851 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3642 av_push (*avp, SvREFCNT_inc (block));
2852 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2853 {
2854 SV *old = PL_diehook;
2855 PL_diehook = 0;
2856 SvREFCNT_dec (old);
2857 croak ("\3async_pool terminate\2\n");
2858 }
2859 3643
2860 av_clear (GvAV (PL_defgv)); 3644 if (!ix)
2861 hv_store (hv, "desc", sizeof ("desc") - 1, 3645 on_enterleave_call (aTHX_ block);
2862 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2863 3646
2864 coro->prio = 0; 3647 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2865 3648 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2866 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3649 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2867 api_trace (aTHX_ coro_current, 0);
2868
2869 av_push (av_async_pool, newSVsv (coro_current));
2870} 3650}
2871 3651
2872 3652
2873MODULE = Coro::State PACKAGE = PerlIO::cede 3653MODULE = Coro::State PACKAGE = PerlIO::cede
2874 3654
… …
2879MODULE = Coro::State PACKAGE = Coro::Semaphore 3659MODULE = Coro::State PACKAGE = Coro::Semaphore
2880 3660
2881SV * 3661SV *
2882new (SV *klass, SV *count = 0) 3662new (SV *klass, SV *count = 0)
2883 CODE: 3663 CODE:
3664{
3665 int semcnt = 1;
3666
3667 if (count)
3668 {
3669 SvGETMAGIC (count);
3670
3671 if (SvOK (count))
3672 semcnt = SvIV (count);
3673 }
3674
2884 RETVAL = sv_bless ( 3675 RETVAL = sv_bless (
2885 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3676 coro_waitarray_new (aTHX_ semcnt),
2886 GvSTASH (CvGV (cv)) 3677 GvSTASH (CvGV (cv))
2887 ); 3678 );
3679}
2888 OUTPUT: 3680 OUTPUT:
2889 RETVAL 3681 RETVAL
2890 3682
2891# helper for Coro::Channel 3683# helper for Coro::Channel and others
2892SV * 3684SV *
2893_alloc (int count) 3685_alloc (int count)
2894 CODE: 3686 CODE:
2895 RETVAL = coro_waitarray_new (aTHX_ count); 3687 RETVAL = coro_waitarray_new (aTHX_ count);
2896 OUTPUT: 3688 OUTPUT:
… …
2909 adjust = 1 3701 adjust = 1
2910 CODE: 3702 CODE:
2911 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3703 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2912 3704
2913void 3705void
2914down (SV *self) 3706down (...)
2915 CODE: 3707 CODE:
2916 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3708 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2917 3709
2918void 3710void
2919wait (SV *self) 3711wait (...)
2920 CODE: 3712 CODE:
2921 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3713 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2922 3714
2923void 3715void
2924try (SV *self) 3716try (SV *self)
… …
2954 for (i = 1; i <= wcount; ++i) 3746 for (i = 1; i <= wcount; ++i)
2955 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3747 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2956 } 3748 }
2957} 3749}
2958 3750
3751MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3752
3753void
3754_may_delete (SV *sem, int count, int extra_refs)
3755 PPCODE:
3756{
3757 AV *av = (AV *)SvRV (sem);
3758
3759 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3760 && AvFILLp (av) == 0 /* no waiters, just count */
3761 && SvIV (AvARRAY (av)[0]) == count)
3762 XSRETURN_YES;
3763
3764 XSRETURN_NO;
3765}
3766
2959MODULE = Coro::State PACKAGE = Coro::Signal 3767MODULE = Coro::State PACKAGE = Coro::Signal
2960 3768
2961SV * 3769SV *
2962new (SV *klass) 3770new (SV *klass)
2963 CODE: 3771 CODE:
… …
2967 ); 3775 );
2968 OUTPUT: 3776 OUTPUT:
2969 RETVAL 3777 RETVAL
2970 3778
2971void 3779void
2972wait (SV *self) 3780wait (...)
2973 CODE: 3781 CODE:
2974 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3782 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
2975 3783
2976void 3784void
2977broadcast (SV *self) 3785broadcast (SV *self)
… …
3034 3842
3035void 3843void
3036_register (char *target, char *proto, SV *req) 3844_register (char *target, char *proto, SV *req)
3037 CODE: 3845 CODE:
3038{ 3846{
3039 HV *st; 3847 SV *req_cv = s_get_cv_croak (req);
3040 GV *gvp;
3041 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3042 /* newXSproto doesn't return the CV on 5.8 */ 3848 /* newXSproto doesn't return the CV on 5.8 */
3043 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3849 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3044 sv_setpv ((SV *)slf_cv, proto); 3850 sv_setpv ((SV *)slf_cv, proto);
3045 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3851 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3046} 3852}
3047 3853
3854MODULE = Coro::State PACKAGE = Coro::Select
3855
3856void
3857patch_pp_sselect ()
3858 CODE:
3859 if (!coro_old_pp_sselect)
3860 {
3861 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3862 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3863 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3864 }
3865
3866void
3867unpatch_pp_sselect ()
3868 CODE:
3869 if (coro_old_pp_sselect)
3870 {
3871 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3872 coro_old_pp_sselect = 0;
3873 }
3874
3875

Diff Legend

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