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.298 by root, Tue Nov 18 23:20:41 2008 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50:23 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
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 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
111#endif 58#endif
112 59
113#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
127#else 74#else
128# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
130#endif 77#endif
131 78
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
133 80
134#if __GNUC__ >= 3 81#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 84# define INLINE static inline
138#else 85#else
139# define attribute(x) 86# define attribute(x)
140# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
141# define INLINE static 88# define INLINE static
… …
153# if CORO_PTHREAD 100# if CORO_PTHREAD
154static void *coro_thx; 101static void *coro_thx;
155# endif 102# endif
156#endif 103#endif
157 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
158static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
159 117
160/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
163 121
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 126static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
172static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 136static SV *rv_diehook;
175static SV *rv_warnhook; 137static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
177 139
178/* async_pool helper stuff */ 140/* async_pool helper stuff */
179static SV *sv_pool_rss; 141static SV *sv_pool_rss;
180static SV *sv_pool_size; 142static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler;
182 147
183/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
184static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
185 156
186static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
188 159
189enum { 160enum {
… …
215 int valgrind_id; 186 int valgrind_id;
216#endif 187#endif
217 unsigned char flags; 188 unsigned char flags;
218} coro_cctx; 189} coro_cctx;
219 190
191coro_cctx *cctx_current; /* the currently running cctx */
192
193/*****************************************************************************/
194
220enum { 195enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 196 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 201};
226 202
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 203/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 204typedef struct
229{ 205{
230 SV *defsv; 206 SV *defsv;
231 AV *defav; 207 AV *defav;
232 SV *errsv; 208 SV *errsv;
233 SV *irsgv; 209 SV *irsgv;
210 HV *hinthv;
234#define VAR(name,type) type name; 211#define VAR(name,type) type name;
235# include "state.h" 212# include "state.h"
236#undef VAR 213#undef VAR
237} perl_slots; 214} perl_slots;
238 215
… …
241/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
242struct coro { 219struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 221 coro_cctx *cctx;
245 222
223 /* ready queue */
224 struct coro *next_ready;
225
246 /* state data */ 226 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 228 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
250 230
231 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 232 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 233 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 236 void (*on_destroy)(pTHX_ struct coro *coro);
256 237
257 /* statistics */ 238 /* statistics */
258 int usecount; /* number of transfers to this coro */ 239 int usecount; /* number of transfers to this coro */
259 240
260 /* coro process data */ 241 /* coro process data */
261 int prio; 242 int prio;
262 SV *except; /* exception to be thrown */ 243 SV *except; /* exception to be thrown */
244 SV *rouse_cb;
263 245
264 /* async_pool */ 246 /* async_pool */
265 SV *saved_deffh; 247 SV *saved_deffh;
248 SV *invoke_cb;
249 AV *invoke_av;
250
251 /* on_enter/on_leave */
252 AV *on_enter;
253 AV *on_leave;
254
255 /* times */
256 coro_ts t_cpu, t_real;
266 257
267 /* linked list */ 258 /* linked list */
268 struct coro *next, *prev; 259 struct coro *next, *prev;
269}; 260};
270 261
… …
276/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
277static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
278 269
279/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
280 271
281#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
282#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
283#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
284#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
285#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
286#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
287 278
288/* for Coro.pm */ 279/* for Coro.pm */
289static SV *coro_current; 280static SV *coro_current;
290static SV *coro_readyhook; 281static SV *coro_readyhook;
291static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate;
292static struct coro *coro_first; 284static struct coro *coro_first;
293#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
294 306
295/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
296 308
297static SV * 309static SV *
298coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
… …
322 get_hv (name, create); 334 get_hv (name, create);
323#endif 335#endif
324 return get_hv (name, create); 336 return get_hv (name, create);
325} 337}
326 338
339INLINE void
340coro_times_update ()
341{
342#ifdef coro_clock_gettime
343 struct timespec ts;
344
345 ts.tv_sec = ts.tv_nsec = 0;
346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
348
349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
384}
385
386/*****************************************************************************/
387/* magic glue */
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391
392#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \
395 : mg_find (sv, type))
396
397#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \
400 : 0)
401
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404
405INLINE struct coro *
406SvSTATE_ (pTHX_ SV *coro)
407{
408 HV *stash;
409 MAGIC *mg;
410
411 if (SvROK (coro))
412 coro = SvRV (coro);
413
414 if (expect_false (SvTYPE (coro) != SVt_PVHV))
415 croak ("Coro::State object required");
416
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr;
427}
428
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430
431/* faster than SvSTATE, but expects a coroutine hv */
432#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434
435/*****************************************************************************/
436/* padlist management and caching */
437
327static AV * 438static AV *
328coro_clone_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
329{ 440{
330 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 442 AV *newpadlist, *newpad;
332 443
333 newpadlist = newAV (); 444 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 450#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 452 --AvFILLp (padlist);
342 453
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
345 456
346 return newpadlist; 457 return newpadlist;
347} 458}
348 459
349static void 460static void
350free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
351{ 462{
352 /* may be during global destruction */ 463 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
354 { 465 {
355 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
356 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
357 { 469 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
359 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 472 I32 j = AvFILLp (av);
361 SV *sv; 473
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 479 }
368 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
370 } 485 }
371} 486}
372 487
373static int 488static int
374coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
375{ 490{
376 AV *padlist; 491 AV *padlist;
377 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
378 497
379 /* casting is fun. */ 498 /* casting is fun. */
380 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
381 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
382 501
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 503
385 return 0; 504 return 0;
386} 505}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 506
391static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 508 0, 0, 0, 0,
393 coro_cv_free 509 coro_cv_free
394}; 510};
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 511
439/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
440static void 513static void
441get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
442{ 515{
… …
448 else 521 else
449 { 522 {
450#if CORO_PREFER_PERL_FUNCTIONS 523#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 524 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 525 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 526 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 527 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 528 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 529 SvREFCNT_dec (cp);
457#else 530#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 532#endif
460 } 533 }
461} 534}
462 535
463static void 536static void
… …
470 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
471 544
472 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
473 546
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
476 549
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 551}
479 552
480/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
481 557
482static void 558static void
483load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
484{ 560{
485 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
486 c->slot = 0; 562 c->slot = 0;
487 563
488 PL_mainstack = c->mainstack; 564 PL_mainstack = c->mainstack;
489 565
490 GvSV (PL_defgv) = slot->defsv; 566 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 567 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 568 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
494 571
495 #define VAR(name,type) PL_ ## name = slot->name; 572 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 573 # include "state.h"
497 #undef VAR 574 #undef VAR
498 575
… …
512 PUTBACK; 589 PUTBACK;
513 } 590 }
514 591
515 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
516 CORO_THROW = c->except; 593 CORO_THROW = c->except;
594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
603 if (expect_false (c->on_enter))
604 {
605 int i;
606
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 }
517} 610}
518 611
519static void 612static void
520save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
521{ 614{
615 if (expect_false (c->on_leave))
616 {
617 int i;
618
619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
629 }
630
522 c->except = CORO_THROW; 631 c->except = CORO_THROW;
523 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
524 633
525 { 634 {
526 dSP; 635 dSP;
… …
539 { 648 {
540 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
541 { 650 {
542 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
543 652
544 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
545 { 654 {
546 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
547 656
548 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
549 { 658 {
… …
573 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
574 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
575 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
576 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
577 { 686 {
578 int i; 687 unsigned int i;
579 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
580 CXINC; 689 CXINC;
581 } 690 }
582 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
583 692
584 c->mainstack = PL_mainstack; 693 c->mainstack = PL_mainstack;
585 694
586 { 695 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 697
589 slot->defav = GvAV (PL_defgv); 698 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 699 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 700 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
593 703
594 #define VAR(name,type) slot->name = PL_ ## name; 704 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 705 # include "state.h"
596 #undef VAR 706 #undef VAR
597 } 707 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 712 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 713 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 714 * not usually need a lot of stackspace.
605 */ 715 */
606#if CORO_PREFER_PERL_FUNCTIONS 716#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 717# define coro_init_stacks(thx) init_stacks ()
608#else 718#else
609static void 719static void
610coro_init_stacks (pTHX) 720coro_init_stacks (pTHX)
611{ 721{
612 PL_curstackinfo = new_stackinfo(32, 8); 722 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 785#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 786 Safefree (PL_retstack);
677#endif 787#endif
678} 788}
679 789
790#define CORO_RSS \
791 rss += sizeof (SYM (curstackinfo)); \
792 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
793 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
794 rss += SYM (tmps_max) * sizeof (SV *); \
795 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
796 rss += SYM (scopestack_max) * sizeof (I32); \
797 rss += SYM (savestack_max) * sizeof (ANY);
798
680static size_t 799static size_t
681coro_rss (pTHX_ struct coro *coro) 800coro_rss (pTHX_ struct coro *coro)
682{ 801{
683 size_t rss = sizeof (*coro); 802 size_t rss = sizeof (*coro);
684 803
685 if (coro->mainstack) 804 if (coro->mainstack)
686 { 805 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 806 if (coro->flags & CF_RUNNING)
691 { 807 {
692 slot = &tmp_slot; 808 #define SYM(sym) PL_ ## sym
693 809 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 810 #undef SYM
697 } 811 }
698 else 812 else
699 slot = coro->slot;
700
701 if (slot)
702 { 813 {
703 rss += sizeof (slot->curstackinfo); 814 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 815 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 816 #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 } 817 }
715 } 818 }
716 819
717 return rss; 820 return rss;
718} 821}
… …
731#endif 834#endif
732 835
733/* 836/*
734 * This overrides the default magic get method of %SIG elements. 837 * 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 838 * 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 839 * and instead of trying to save and restore the hash elements, we just provide
737 * readback here. 840 * 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 */ 841 */
742static int 842static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 844{
745 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 899
800 if (svp) 900 if (svp)
801 { 901 {
802 SV *old = *svp; 902 SV *old = *svp;
803 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
805 return 0; 905 return 0;
806 } 906 }
807 } 907 }
808 908
… …
818 918
819static int 919static int
820slf_check_nop (pTHX_ struct CoroSLF *frame) 920slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 921{
822 return 0; 922 return 0;
923}
924
925static int
926slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{
928 return 1;
823} 929}
824 930
825static UNOP coro_setup_op; 931static UNOP coro_setup_op;
826 932
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 933static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
834 940
835 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 942 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 943 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 944 PL_comppad = 0;
945 PL_comppad_name = 0;
946 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 948 PL_curpm = 0;
840 PL_curpad = 0; 949 PL_curpad = 0;
841 PL_localizing = 0; 950 PL_localizing = 0;
842 PL_dirty = 0; 951 PL_dirty = 0;
843 PL_restartop = 0; 952 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 953#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 954 PL_parser = 0;
846#endif 955#endif
956 PL_hints = 0;
847 957
848 /* recreate the die/warn hooks */ 958 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 959 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); 960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 961
852 GvSV (PL_defgv) = newSV (0); 962 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 963 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 964 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 967 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 969
859 { 970 {
860 dSP; 971 dSP;
861 UNOP myop; 972 UNOP myop;
862 973
863 Zero (&myop, 1, UNOP); 974 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 975 myop.op_next = Nullop;
976 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 977 myop.op_flags = OPf_WANT_VOID;
866 978
867 PUSHMARK (SP); 979 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 980 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 981 PUTBACK;
870 PL_op = (OP *)&myop; 982 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 983 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 984 }
874 985
875 /* this newly created coroutine might be run on an existing cctx which most 986 /* 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. 987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 988 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 989 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 */ 990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 991
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 992 /* 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; 993 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 994 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 995 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 996 /* no flags etc. required, as an init function won't be called */
886 997
887 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
888 999
889 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
890 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
891}
892 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
893static void 1010static void
894coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
895{ 1012{
896 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
897 { 1014 {
898 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
908 1025
909 /* unwind main stack */ 1026 /* unwind main stack */
910 dounwind (-1); 1027 dounwind (-1);
911 } 1028 }
1029}
912 1030
913 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
914 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
915 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
916 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
917 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv));
919 1035
920 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook);
922 1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
1046
1047 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs;
1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1058
1059 load_perl (aTHX_ current);
1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
923 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (CORO_THROW); 1069 SvREFCNT_dec (coro->rouse_cb);
925 1070 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1071 SvREFCNT_dec (coro->invoke_av);
1072 }
927} 1073}
928 1074
929INLINE void 1075INLINE void
930free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
931{ 1077{
… …
939static int 1085static int
940runops_trace (pTHX) 1086runops_trace (pTHX)
941{ 1087{
942 COP *oldcop = 0; 1088 COP *oldcop = 0;
943 int oldcxix = -2; 1089 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1090
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1091 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1092 {
949 PERL_ASYNC_CHECK (); 1093 PERL_ASYNC_CHECK ();
950 1094
951 if (cctx->flags & CC_TRACE_ALL) 1095 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1096 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1097 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 1098 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1099 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1100 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1101 AV *av = newAV (); /* return values */
958 SV **cb; 1102 SV **cb;
… …
995 1139
996 if (PL_curcop != &PL_compiling) 1140 if (PL_curcop != &PL_compiling)
997 { 1141 {
998 SV **cb; 1142 SV **cb;
999 1143
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1145 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1147
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1149 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1150 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1151 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1152 SV *fullname = sv_2mortal (newSV (0));
1010 1153
1011 if (isGV (gv)) 1154 if (isGV (gv))
… …
1016 SAVETMPS; 1159 SAVETMPS;
1017 EXTEND (SP, 3); 1160 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1161 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1162 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1163 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1164 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1165 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1166 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); 1167 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1168 SPAGAIN;
1026 FREETMPS; 1169 FREETMPS;
… …
1029 } 1172 }
1030 1173
1031 oldcxix = cxstack_ix; 1174 oldcxix = cxstack_ix;
1032 } 1175 }
1033 1176
1034 if (cctx->flags & CC_TRACE_LINE) 1177 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1178 {
1036 dSP; 1179 dSP;
1037 1180
1038 PL_runops = RUNOPS_DEFAULT; 1181 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1182 ENTER;
… …
1058 1201
1059 TAINT_NOT; 1202 TAINT_NOT;
1060 return 0; 1203 return 0;
1061} 1204}
1062 1205
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1206static struct CoroSLF cctx_ssl_frame;
1065 1207
1066static void 1208static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1209slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1210{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1211 ta->prev = 0;
1071} 1212}
1072 1213
1073static int 1214static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1215slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1216{
… …
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1220}
1080 1221
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1223static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1224cctx_prepare (pTHX)
1084{ 1225{
1085 PL_top_env = &PL_start_env; 1226 PL_top_env = &PL_start_env;
1086 1227
1087 if (cctx->flags & CC_TRACE) 1228 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1229 PL_runops = runops_trace;
1089 1230
1090 /* we already must be executing an SLF op, there is no other valid way 1231 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1232 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1233 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1234 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1235
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1236 /* 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; 1237 cctx_ssl_frame = slf_frame;
1098 1238
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1239 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1240 slf_frame.check = slf_check_set_stacklevel;
1101} 1241}
… …
1124 /* normally we would need to skip the entersub here */ 1264 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1265 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1266 /* PL_nop = PL_nop->op_next */
1127 1267
1128 /* inject a fake subroutine call to cctx_init */ 1268 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1269 cctx_prepare (aTHX);
1130 1270
1131 /* cctx_run is the alternative tail of transfer() */ 1271 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1272 transfer_tail (aTHX);
1133 1273
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1277 /*
1278 * Unfortunately, there is no way to get at the return values of the
1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */
1137 1282
1138 /* 1283 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1284 * 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) 1285 * 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 1286 * 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" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1291 */
1145 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1294 }
1148} 1295}
… …
1225cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1226{ 1373{
1227 if (!cctx) 1374 if (!cctx)
1228 return; 1375 return;
1229 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1230 --cctx_count; 1379 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1232 1381
1233 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1298 1447
1299 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1300 { 1449 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 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,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1303 1452
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)) 1453 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,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1309 1455
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 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,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1313#endif 1459#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1466{
1321 dSTACKLEVEL; 1467 dSTACKLEVEL;
1322 1468
1323 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1470 if (expect_false (!prev))
1325 { 1471 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1472 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1474 }
1329 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1330 { 1476 {
1331 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1332 1478
1333 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1334 { 1480 {
1335 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1339 } 1484 }
1340 1485
1341 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1353 } 1498 }
1354 else 1499 else
1355 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1356 1501
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1503 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1506 && !force_cctx
1364 )) 1507 ))
1365 { 1508 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1509 /* 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)); 1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1511
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 */ 1512 /* 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 */ 1513 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1376 1517
1377 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1378 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1379 1522
1380 ++next->usecount; 1523 ++next->usecount;
1381 1524
1382 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1527
1385 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1386 { 1531 {
1387 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1535 }
1391 1536
1392 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1393 } 1538 }
1394} 1539}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1548{
1404 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1405 return 0; 1550 return 0;
1406 1551
1407 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1409 1554
1410 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1411 1556
1412 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1561 --coro_nready;
1417 } 1562 }
1418 else 1563 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1565
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1422 { 1567 && coro->mainstack != main_mainstack
1423 struct coro temp; 1568 && coro->slot
1424 1569 && !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);
1429
1430 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436 1571
1437 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1575 SvREFCNT_dec (CORO_THROW);
1439 1576
1440 if (coro->next) coro->next->prev = coro->prev; 1577 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1578 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1579 if (coro == coro_first) coro_first = coro->next;
1443 1580
… …
1502/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1503 1640
1504INLINE void 1641INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1506{ 1643{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1508}
1509 1645
1510INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1511coro_deq (pTHX) 1654coro_deq (pTHX)
1512{ 1655{
1513 int prio; 1656 int prio;
1514 1657
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1517 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1518 1669
1519 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1520} 1688}
1521 1689
1522static int 1690static int
1523api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1524{ 1692{
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); 1693 struct coro *coro = SvSTATE (coro_sv);
1533 1694
1534 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1535 return 0; 1696 return 0;
1536 1697
1537 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1538 1699
1539 sv_hook = coro_nready ? 0 : coro_readyhook;
1540 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1541
1542 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1543 ++coro_nready;
1544 1701
1545 if (sv_hook) 1702 if (!coro_nready++)
1546 { 1703 if (coroapi.readyhook)
1547 dSP; 1704 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 1705
1563 return 1; 1706 return 1;
1564} 1707}
1565 1708
1566static int 1709static int
1567api_is_ready (pTHX_ SV *coro_sv) 1710api_is_ready (pTHX_ SV *coro_sv)
1568{ 1711{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1712 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1713}
1571 1714
1715/* expects to own a reference to next->hv */
1572INLINE void 1716INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1718{
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); 1719 SV *prev_sv = SvRV (coro_current);
1720
1614 ta->prev = SvSTATE_hv (prev_sv); 1721 ta->prev = SvSTATE_hv (prev_sv);
1722 ta->next = next;
1723
1615 TRANSFER_CHECK (*ta); 1724 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1725
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1726 SvRV_set (coro_current, (SV *)next->hv);
1619 1727
1620 free_coro_mortal (aTHX); 1728 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1729 coro_mortal = prev_sv;
1622} 1730}
1623 1731
1732static void
1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1734{
1735 for (;;)
1736 {
1737 struct coro *next = coro_deq (aTHX);
1738
1739 if (expect_true (next))
1740 {
1741 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else
1745 {
1746 next->flags &= ~CF_READY;
1747 --coro_nready;
1748
1749 prepare_schedule_to (aTHX_ ta, next);
1750 break;
1751 }
1752 }
1753 else
1754 {
1755 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle)))
1758 {
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready;
1762 }
1763 else
1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP;
1767
1768 ENTER;
1769 SAVETMPS;
1770
1771 PUSHMARK (SP);
1772 PUTBACK;
1773 call_sv (sv_idle, G_VOID | G_DISCARD);
1774
1775 FREETMPS;
1776 LEAVE;
1777 }
1778 }
1779 }
1780}
1781
1624INLINE void 1782INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1783prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1784{
1627 api_ready (aTHX_ coro_current); 1785 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1786 prepare_schedule (aTHX_ ta);
… …
1647{ 1805{
1648 struct coro_transfer_args ta; 1806 struct coro_transfer_args ta;
1649 1807
1650 prepare_schedule (aTHX_ &ta); 1808 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1809 TRANSFER (ta, 1);
1810}
1811
1812static void
1813api_schedule_to (pTHX_ SV *coro_sv)
1814{
1815 struct coro_transfer_args ta;
1816 struct coro *next = SvSTATE (coro_sv);
1817
1818 SvREFCNT_inc_NN (coro_sv);
1819 prepare_schedule_to (aTHX_ &ta, next);
1652} 1820}
1653 1821
1654static int 1822static int
1655api_cede (pTHX) 1823api_cede (pTHX)
1656{ 1824{
… …
1685static void 1853static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1855{
1688 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1689 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1690 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1691 { 1862 {
1692 if (!coro->cctx) 1863 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1867
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1869 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1871 {
… …
1703 if (coro->flags & CF_RUNNING) 1874 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1875 PL_runops = RUNOPS_DEFAULT;
1705 else 1876 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1877 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1878 }
1879}
1880
1881static void
1882coro_call_on_destroy (pTHX_ struct coro *coro)
1883{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886
1887 if (on_destroyp)
1888 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1890
1891 while (AvFILLp (on_destroy) >= 0)
1892 {
1893 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy);
1895
1896 PUSHMARK (SP);
1897
1898 if (statusp)
1899 {
1900 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1);
1903
1904 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]);
1906 }
1907
1908 PUTBACK;
1909 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1910 }
1911 }
1912}
1913
1914static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1916{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV ();
1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1924 av_extend (av, items - 1);
1925
1926 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1929
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1931
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager);
1934
1935 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat;
1937
1938 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/
1941}
1942
1943/*****************************************************************************/
1944/* async pool handler */
1945
1946static int
1947slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1948{
1949 HV *hv = (HV *)SvRV (coro_current);
1950 struct coro *coro = (struct coro *)frame->data;
1951
1952 if (!coro->invoke_cb)
1953 return 1; /* loop till we have invoke */
1954 else
1955 {
1956 hv_store (hv, "desc", sizeof ("desc") - 1,
1957 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1958
1959 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1960
1961 {
1962 dSP;
1963 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1964 PUTBACK;
1965 }
1966
1967 SvREFCNT_dec (GvAV (PL_defgv));
1968 GvAV (PL_defgv) = coro->invoke_av;
1969 coro->invoke_av = 0;
1970
1971 return 0;
1972 }
1973}
1974
1975static void
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{
1978 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980
1981 if (expect_true (coro->saved_deffh))
1982 {
1983 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0;
1986
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1991 coro->invoke_av = newAV ();
1992
1993 frame->prepare = prepare_nop;
1994 }
1995 else
1996 {
1997 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1999
2000 coro->prio = 0;
2001
2002 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2003 api_trace (aTHX_ coro_current, 0);
2004
2005 frame->prepare = prepare_schedule;
2006 av_push (av_async_pool, SvREFCNT_inc (hv));
2007 }
2008 }
2009 else
2010 {
2011 /* first iteration, simply fall through */
2012 frame->prepare = prepare_nop;
2013 }
2014
2015 frame->check = slf_check_pool_handler;
2016 frame->data = (void *)coro;
2017}
2018
2019/*****************************************************************************/
2020/* rouse callback */
2021
2022#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2023
2024static void
2025coro_rouse_callback (pTHX_ CV *cv)
2026{
2027 dXSARGS;
2028 SV *data = (SV *)S_GENSUB_ARG;
2029
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 {
2032 /* first call, set args */
2033 SV *coro = SvRV (data);
2034 AV *av = newAV ();
2035
2036 SvRV_set (data, (SV *)av);
2037
2038 /* better take a full copy of the arguments */
2039 while (items--)
2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
2044 }
2045
2046 XSRETURN_EMPTY;
2047}
2048
2049static int
2050slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2051{
2052 SV *data = (SV *)frame->data;
2053
2054 if (CORO_THROW)
2055 return 0;
2056
2057 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2058 return 1;
2059
2060 /* now push all results on the stack */
2061 {
2062 dSP;
2063 AV *av = (AV *)SvRV (data);
2064 int i;
2065
2066 EXTEND (SP, AvFILLp (av) + 1);
2067 for (i = 0; i <= AvFILLp (av); ++i)
2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2069
2070 /* we have stolen the elements, so set length to zero and free */
2071 AvFILLp (av) = -1;
2072 av_undef (av);
2073
2074 PUTBACK;
2075 }
2076
2077 return 0;
2078}
2079
2080static void
2081slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 SV *cb;
2084
2085 if (items)
2086 cb = arg [0];
2087 else
2088 {
2089 struct coro *coro = SvSTATE_current;
2090
2091 if (!coro->rouse_cb)
2092 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2093
2094 cb = sv_2mortal (coro->rouse_cb);
2095 coro->rouse_cb = 0;
2096 }
2097
2098 if (!SvROK (cb)
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2102
2103 {
2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2105 SV *data = (SV *)S_GENSUB_ARG;
2106
2107 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait;
2110 }
2111}
2112
2113static SV *
2114coro_new_rouse_cb (pTHX)
2115{
2116 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2120
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2123
2124 SvREFCNT_dec (coro->rouse_cb);
2125 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2126
2127 return cb;
1708} 2128}
1709 2129
1710/*****************************************************************************/ 2130/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2131/* schedule-like-function opcode (SLF) */
1712 2132
… …
1759static void 2179static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2180slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2181{
1762 frame->prepare = prepare_schedule; 2182 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2183 frame->check = slf_check_nop;
2184}
2185
2186static void
2187slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2188{
2189 struct coro *next = (struct coro *)slf_frame.data;
2190
2191 SvREFCNT_inc_NN (next->hv);
2192 prepare_schedule_to (aTHX_ ta, next);
2193}
2194
2195static void
2196slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 if (!items)
2199 croak ("Coro::schedule_to expects a coroutine argument, caught");
2200
2201 frame->data = (void *)SvSTATE (arg [0]);
2202 frame->prepare = slf_prepare_schedule_to;
2203 frame->check = slf_check_nop;
2204}
2205
2206static void
2207slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2208{
2209 api_ready (aTHX_ SvRV (coro_current));
2210
2211 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2212}
1765 2213
1766static void 2214static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2215slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2216{
… …
1883 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1884 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
1885 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1886 2334
1887 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
1888 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1889 slf_cv = cv; 2338 slf_cv = cv;
1890 2339
1891 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
1892 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
… …
1914 } 2363 }
1915 else 2364 else
1916 slf_argc = 0; 2365 slf_argc = 0;
1917 2366
1918 PL_op->op_ppaddr = pp_slf; 2367 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2368 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2369
1921 PL_op = (OP *)&slf_restore; 2370 PL_op = (OP *)&slf_restore;
2371}
2372
2373/*****************************************************************************/
2374/* dynamic wind */
2375
2376static void
2377on_enterleave_call (pTHX_ SV *cb)
2378{
2379 dSP;
2380
2381 PUSHSTACK;
2382
2383 PUSHMARK (SP);
2384 PUTBACK;
2385 call_sv (cb, G_VOID | G_DISCARD);
2386 SPAGAIN;
2387
2388 POPSTACK;
2389}
2390
2391static SV *
2392coro_avp_pop_and_free (pTHX_ AV **avp)
2393{
2394 AV *av = *avp;
2395 SV *res = av_pop (av);
2396
2397 if (AvFILLp (av) < 0)
2398 {
2399 *avp = 0;
2400 SvREFCNT_dec (av);
2401 }
2402
2403 return res;
2404}
2405
2406static void
2407coro_pop_on_enter (pTHX_ void *coro)
2408{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2410 SvREFCNT_dec (cb);
2411}
2412
2413static void
2414coro_pop_on_leave (pTHX_ void *coro)
2415{
2416 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2417 on_enterleave_call (aTHX_ sv_2mortal (cb));
1922} 2418}
1923 2419
1924/*****************************************************************************/ 2420/*****************************************************************************/
1925/* PerlIO::cede */ 2421/* PerlIO::cede */
1926 2422
… …
1995 PerlIOBuf_get_cnt, 2491 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2492 PerlIOBuf_set_ptrcnt,
1997}; 2493};
1998 2494
1999/*****************************************************************************/ 2495/*****************************************************************************/
2496/* Coro::Semaphore & Coro::Signal */
2497
2498static SV *
2499coro_waitarray_new (pTHX_ int count)
2500{
2501 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2502 AV *av = newAV ();
2503 SV **ary;
2504
2505 /* unfortunately, building manually saves memory */
2506 Newx (ary, 2, SV *);
2507 AvALLOC (av) = ary;
2508#if PERL_VERSION_ATLEAST (5,10,0)
2509 AvARRAY (av) = ary;
2510#else
2511 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2512 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2513 SvPVX ((SV *)av) = (char *)ary;
2514#endif
2515 AvMAX (av) = 1;
2516 AvFILLp (av) = 0;
2517 ary [0] = newSViv (count);
2518
2519 return newRV_noinc ((SV *)av);
2520}
2521
2000/* Coro::Semaphore */ 2522/* semaphore */
2001 2523
2002static void 2524static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2525coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{ 2526{
2005 SV *count_sv = AvARRAY (av)[0]; 2527 SV *count_sv = AvARRAY (av)[0];
… …
2017 AvARRAY (av)[0] = AvARRAY (av)[1]; 2539 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv; 2540 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av); 2541 cb = av_shift (av);
2020 2542
2021 if (SvOBJECT (cb)) 2543 if (SvOBJECT (cb))
2544 {
2022 api_ready (aTHX_ cb); 2545 api_ready (aTHX_ cb);
2023 else 2546 --count;
2024 croak ("callbacks not yet supported"); 2547 }
2548 else if (SvTYPE (cb) == SVt_PVCV)
2549 {
2550 dSP;
2551 PUSHMARK (SP);
2552 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2553 PUTBACK;
2554 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2555 }
2025 2556
2026 SvREFCNT_dec (cb); 2557 SvREFCNT_dec (cb);
2027
2028 --count;
2029 } 2558 }
2030} 2559}
2031 2560
2032static void 2561static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2562coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2115} 2644}
2116 2645
2117static void 2646static void
2118slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2647slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2119{ 2648{
2649 if (items >= 2)
2650 {
2651 /* callback form */
2652 AV *av = (AV *)SvRV (arg [0]);
2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2654
2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2656
2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2658 coro_semaphore_adjust (aTHX_ av, 0);
2659
2660 frame->prepare = prepare_nop;
2661 frame->check = slf_check_nop;
2662 }
2663 else
2664 {
2120 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2665 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2121 frame->check = slf_check_semaphore_wait; 2666 frame->check = slf_check_semaphore_wait;
2667 }
2122} 2668}
2123 2669
2124/*****************************************************************************/ 2670/* signal */
2125/* gensub: simple closure generation utility */
2126 2671
2127#define GENSUB_ARG CvXSUBANY (cv).any_ptr 2672static void
2128 2673coro_signal_wake (pTHX_ AV *av, int count)
2129/* create a closure from XS, returns a code reference */
2130/* the arg can be accessed via GENSUB_ARG from the callback */
2131/* the callback must use dXSARGS/XSRETURN */
2132static SV *
2133gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2134{ 2674{
2135 CV *cv = (CV *)newSV (0); 2675 SvIVX (AvARRAY (av)[0]) = 0;
2136 2676
2137 sv_upgrade ((SV *)cv, SVt_PVCV); 2677 /* now signal count waiters */
2678 while (count > 0 && AvFILLp (av) > 0)
2679 {
2680 SV *cb;
2138 2681
2139 CvANON_on (cv); 2682 /* swap first two elements so we can shift a waiter */
2140 CvISXSUB_on (cv); 2683 cb = AvARRAY (av)[0];
2141 CvXSUB (cv) = xsub; 2684 AvARRAY (av)[0] = AvARRAY (av)[1];
2142 GENSUB_ARG = arg; 2685 AvARRAY (av)[1] = cb;
2143 2686
2144 return newRV_noinc ((SV *)cv); 2687 cb = av_shift (av);
2688
2689 if (SvTYPE (cb) == SVt_PVCV)
2690 {
2691 dSP;
2692 PUSHMARK (SP);
2693 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2694 PUTBACK;
2695 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2696 }
2697 else
2698 {
2699 api_ready (aTHX_ cb);
2700 sv_setiv (cb, 0); /* signal waiter */
2701 }
2702
2703 SvREFCNT_dec (cb);
2704
2705 --count;
2706 }
2707}
2708
2709static int
2710slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2711{
2712 /* if we are about to throw, also stop waiting */
2713 return SvROK ((SV *)frame->data) && !CORO_THROW;
2714}
2715
2716static void
2717slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2718{
2719 AV *av = (AV *)SvRV (arg [0]);
2720
2721 if (items >= 2)
2722 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2726 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else if (SvIVX (AvARRAY (av)[0]))
2733 {
2734 SvIVX (AvARRAY (av)[0]) = 0;
2735 frame->prepare = prepare_nop;
2736 frame->check = slf_check_nop;
2737 }
2738 else
2739 {
2740 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2741
2742 av_push (av, waiter);
2743
2744 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2745 frame->prepare = prepare_schedule;
2746 frame->check = slf_check_signal_wait;
2747 }
2145} 2748}
2146 2749
2147/*****************************************************************************/ 2750/*****************************************************************************/
2148/* Coro::AIO */ 2751/* Coro::AIO */
2149 2752
… …
2160 2763
2161static void 2764static void
2162coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2163{ 2766{
2164 dXSARGS; 2767 dXSARGS;
2165 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2166 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2167 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2168 2771
2169 av_extend (state, items); 2772 av_extend (state, items - 1);
2170 2773
2171 sv_upgrade (data_sv, SVt_PV); 2774 sv_upgrade (data_sv, SVt_PV);
2172 SvCUR_set (data_sv, sizeof (struct io_state)); 2775 SvCUR_set (data_sv, sizeof (struct io_state));
2173 SvPOK_only (data_sv); 2776 SvPOK_only (data_sv);
2174 2777
… …
2284 2887
2285 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2286 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2287 2890
2288 /* now push the callback closure */ 2891 /* now push the callback closure */
2289 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2290 2893
2291 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2292 PUTBACK; 2895 PUTBACK;
2293 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2294 } 2897 }
… …
2308 2911
2309 XSRETURN_EMPTY; 2912 XSRETURN_EMPTY;
2310} 2913}
2311 2914
2312/*****************************************************************************/ 2915/*****************************************************************************/
2916
2917#if CORO_CLONE
2918# include "clone.c"
2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2313 2978
2314MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2315 2980
2316PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2317 2982
… …
2322 coro_thx = PERL_GET_CONTEXT; 2987 coro_thx = PERL_GET_CONTEXT;
2323# endif 2988# endif
2324#endif 2989#endif
2325 BOOT_PAGESIZE; 2990 BOOT_PAGESIZE;
2326 2991
2992 cctx_current = cctx_new_empty ();
2993
2327 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2994 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2328 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2995 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2329 2996
2330 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2997 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2331 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2998 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2350 3017
2351 { 3018 {
2352 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3019 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2353 3020
2354 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3021 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2355 hv_store_ent (PL_custom_op_names, slf, 3022 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2356 newSVpv ("coro_slf", 0), 0);
2357 3023
2358 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3024 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2359 hv_store_ent (PL_custom_op_descs, slf, 3025 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2360 newSVpv ("coro schedule like function", 0), 0);
2361 } 3026 }
2362 3027
2363 coroapi.ver = CORO_API_VERSION; 3028 coroapi.ver = CORO_API_VERSION;
2364 coroapi.rev = CORO_API_REVISION; 3029 coroapi.rev = CORO_API_REVISION;
2365 3030
… …
2377 3042
2378 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2379 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2380 3045
2381 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2382 } 3050 }
2383 3051
2384 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2385} 3053}
2386 3054
2387SV * 3055SV *
2388new (char *klass, ...) 3056new (SV *klass, ...)
3057 ALIAS:
3058 Coro::new = 1
2389 CODE: 3059 CODE:
2390{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2391 struct coro *coro; 3061 OUTPUT:
2392 MAGIC *mg;
2393 HV *hv;
2394 int i;
2395
2396 Newz (0, coro, 1, struct coro);
2397 coro->args = newAV ();
2398 coro->flags = CF_NEW;
2399
2400 if (coro_first) coro_first->prev = coro;
2401 coro->next = coro_first;
2402 coro_first = coro;
2403
2404 coro->hv = hv = newHV ();
2405 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2406 mg->mg_flags |= MGf_DUP;
2407 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2408
2409 av_extend (coro->args, items - 1);
2410 for (i = 1; i < items; i++)
2411 av_push (coro->args, newSVsv (ST (i)));
2412}
2413 OUTPUT:
2414 RETVAL 3062 RETVAL
2415 3063
2416void 3064void
2417transfer (...) 3065transfer (...)
2418 PROTOTYPE: $$ 3066 PROTOTYPE: $$
… …
2429void 3077void
2430_exit (int code) 3078_exit (int code)
2431 PROTOTYPE: $ 3079 PROTOTYPE: $
2432 CODE: 3080 CODE:
2433 _exit (code); 3081 _exit (code);
3082
3083SV *
3084clone (Coro::State coro)
3085 CODE:
3086{
3087#if CORO_CLONE
3088 struct coro *ncoro = coro_clone (aTHX_ coro);
3089 MAGIC *mg;
3090 /* TODO: too much duplication */
3091 ncoro->hv = newHV ();
3092 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3093 mg->mg_flags |= MGf_DUP;
3094 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3095#else
3096 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3097#endif
3098}
3099 OUTPUT:
3100 RETVAL
2434 3101
2435int 3102int
2436cctx_stacksize (int new_stacksize = 0) 3103cctx_stacksize (int new_stacksize = 0)
2437 PROTOTYPE: ;$ 3104 PROTOTYPE: ;$
2438 CODE: 3105 CODE:
… …
2488 eval = 1 3155 eval = 1
2489 CODE: 3156 CODE:
2490{ 3157{
2491 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3158 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2492 { 3159 {
2493 struct coro temp; 3160 struct coro *current = SvSTATE_current;
2494 3161
2495 if (!(coro->flags & CF_RUNNING)) 3162 if (current != coro)
2496 { 3163 {
2497 PUTBACK; 3164 PUTBACK;
2498 save_perl (aTHX_ &temp); 3165 save_perl (aTHX_ current);
2499 load_perl (aTHX_ coro); 3166 load_perl (aTHX_ coro);
3167 SPAGAIN;
2500 } 3168 }
2501 3169
2502 {
2503 dSP;
2504 ENTER;
2505 SAVETMPS;
2506 PUTBACK;
2507 PUSHSTACK; 3170 PUSHSTACK;
3171
2508 PUSHMARK (SP); 3172 PUSHMARK (SP);
3173 PUTBACK;
2509 3174
2510 if (ix) 3175 if (ix)
2511 eval_sv (coderef, 0); 3176 eval_sv (coderef, 0);
2512 else 3177 else
2513 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3178 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2514 3179
2515 POPSTACK; 3180 POPSTACK;
2516 SPAGAIN; 3181 SPAGAIN;
2517 FREETMPS;
2518 LEAVE;
2519 PUTBACK;
2520 }
2521 3182
2522 if (!(coro->flags & CF_RUNNING)) 3183 if (current != coro)
2523 { 3184 {
3185 PUTBACK;
2524 save_perl (aTHX_ coro); 3186 save_perl (aTHX_ coro);
2525 load_perl (aTHX_ &temp); 3187 load_perl (aTHX_ current);
2526 SPAGAIN; 3188 SPAGAIN;
2527 } 3189 }
2528 } 3190 }
2529} 3191}
2530 3192
… …
2534 ALIAS: 3196 ALIAS:
2535 is_ready = CF_READY 3197 is_ready = CF_READY
2536 is_running = CF_RUNNING 3198 is_running = CF_RUNNING
2537 is_new = CF_NEW 3199 is_new = CF_NEW
2538 is_destroyed = CF_DESTROYED 3200 is_destroyed = CF_DESTROYED
3201 is_suspended = CF_SUSPENDED
2539 CODE: 3202 CODE:
2540 RETVAL = boolSV (coro->flags & ix); 3203 RETVAL = boolSV (coro->flags & ix);
2541 OUTPUT: 3204 OUTPUT:
2542 RETVAL 3205 RETVAL
2543 3206
… …
2547 CODE: 3210 CODE:
2548{ 3211{
2549 struct coro *current = SvSTATE_current; 3212 struct coro *current = SvSTATE_current;
2550 SV **throwp = self == current ? &CORO_THROW : &self->except; 3213 SV **throwp = self == current ? &CORO_THROW : &self->except;
2551 SvREFCNT_dec (*throwp); 3214 SvREFCNT_dec (*throwp);
3215 SvGETMAGIC (throw);
2552 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2553} 3217}
2554 3218
2555void 3219void
2556api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2559 3223
2560SV * 3224SV *
2561has_cctx (Coro::State coro) 3225has_cctx (Coro::State coro)
2562 PROTOTYPE: $ 3226 PROTOTYPE: $
2563 CODE: 3227 CODE:
2564 RETVAL = boolSV (!!coro->cctx); 3228 /* maybe manage the running flag differently */
3229 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2565 OUTPUT: 3230 OUTPUT:
2566 RETVAL 3231 RETVAL
2567 3232
2568int 3233int
2569is_traced (Coro::State coro) 3234is_traced (Coro::State coro)
… …
2589 3254
2590void 3255void
2591force_cctx () 3256force_cctx ()
2592 PROTOTYPE: 3257 PROTOTYPE:
2593 CODE: 3258 CODE:
2594 SvSTATE_current->cctx->idle_sp = 0; 3259 cctx_current->idle_sp = 0;
2595 3260
2596void 3261void
2597swap_defsv (Coro::State self) 3262swap_defsv (Coro::State self)
2598 PROTOTYPE: $ 3263 PROTOTYPE: $
2599 ALIAS: 3264 ALIAS:
… …
2607 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3272 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2608 3273
2609 SV *tmp = *src; *src = *dst; *dst = tmp; 3274 SV *tmp = *src; *src = *dst; *dst = tmp;
2610 } 3275 }
2611 3276
3277void
3278cancel (Coro::State self)
3279 CODE:
3280 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
2612 3320
2613MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
2614 3322
2615BOOT: 3323BOOT:
2616{ 3324{
2617 int i;
2618
2619 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2620 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2621 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2622 3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2623 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2624 SvREADONLY_on (coro_current); 3330 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3331 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3332 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2625 3334
3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3337 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3339
2626 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
2627 3341
2628 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2629 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2630 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2631 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3345 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2632 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3346 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2633 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3347 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2634
2635 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2636 coro_ready[i] = newAV ();
2637 3348
2638 { 3349 {
2639 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3350 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2640 3351
2641 coroapi.schedule = api_schedule; 3352 coroapi.schedule = api_schedule;
3353 coroapi.schedule_to = api_schedule_to;
2642 coroapi.cede = api_cede; 3354 coroapi.cede = api_cede;
2643 coroapi.cede_notself = api_cede_notself; 3355 coroapi.cede_notself = api_cede_notself;
2644 coroapi.ready = api_ready; 3356 coroapi.ready = api_ready;
2645 coroapi.is_ready = api_is_ready; 3357 coroapi.is_ready = api_is_ready;
2646 coroapi.nready = coro_nready; 3358 coroapi.nready = coro_nready;
… …
2650 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
2651 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
2652 } 3364 }
2653} 3365}
2654 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3376void
3377terminate (...)
3378 CODE:
3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3380
2655void 3381void
2656schedule (...) 3382schedule (...)
2657 CODE: 3383 CODE:
2658 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3384 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3385
3386void
3387schedule_to (...)
3388 CODE:
3389 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3390
3391void
3392cede_to (...)
3393 CODE:
3394 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2659 3395
2660void 3396void
2661cede (...) 3397cede (...)
2662 CODE: 3398 CODE:
2663 CORO_EXECUTE_SLF_XS (slf_init_cede); 3399 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2677void 3413void
2678_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
2679 PROTOTYPE: $ 3415 PROTOTYPE: $
2680 CODE: 3416 CODE:
2681 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
2682 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
2683 3429
2684int 3430int
2685prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
2686 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
2687 ALIAS: 3433 ALIAS:
… …
2693 if (items > 1) 3439 if (items > 1)
2694 { 3440 {
2695 if (ix) 3441 if (ix)
2696 newprio = coro->prio - newprio; 3442 newprio = coro->prio - newprio;
2697 3443
2698 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3444 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2699 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3445 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2700 3446
2701 coro->prio = newprio; 3447 coro->prio = newprio;
2702 } 3448 }
2703} 3449}
2704 OUTPUT: 3450 OUTPUT:
… …
2718 CODE: 3464 CODE:
2719 RETVAL = coro_nready; 3465 RETVAL = coro_nready;
2720 OUTPUT: 3466 OUTPUT:
2721 RETVAL 3467 RETVAL
2722 3468
2723# for async_pool speedup
2724void 3469void
2725_pool_1 (SV *cb) 3470suspend (Coro::State self)
3471 PROTOTYPE: $
2726 CODE: 3472 CODE:
2727{ 3473 self->flags |= CF_SUSPENDED;
2728 HV *hv = (HV *)SvRV (coro_current);
2729 struct coro *coro = SvSTATE_hv ((SV *)hv);
2730 AV *defav = GvAV (PL_defgv);
2731 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2732 AV *invoke_av;
2733 int i, len;
2734 3474
2735 if (!invoke) 3475void
3476resume (Coro::State self)
3477 PROTOTYPE: $
3478 CODE:
3479 self->flags &= ~CF_SUSPENDED;
3480
3481void
3482_pool_handler (...)
3483 CODE:
3484 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3485
3486void
3487async_pool (SV *cv, ...)
3488 PROTOTYPE: &@
3489 PPCODE:
3490{
3491 HV *hv = (HV *)av_pop (av_async_pool);
3492 AV *av = newAV ();
3493 SV *cb = ST (0);
3494 int i;
3495
3496 av_extend (av, items - 2);
3497 for (i = 1; i < items; ++i)
3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3499
3500 if ((SV *)hv == &PL_sv_undef)
2736 { 3501 {
2737 SV *old = PL_diehook; 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2738 PL_diehook = 0; 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2739 SvREFCNT_dec (old); 3504 SvREFCNT_dec (sv);
2740 croak ("\3async_pool terminate\2\n");
2741 } 3505 }
2742 3506
2743 SvREFCNT_dec (coro->saved_deffh);
2744 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2745
2746 hv_store (hv, "desc", sizeof ("desc") - 1,
2747 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2748
2749 invoke_av = (AV *)SvRV (invoke);
2750 len = av_len (invoke_av);
2751
2752 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2753
2754 if (len > 0)
2755 { 3507 {
2756 av_fill (defav, len - 1); 3508 struct coro *coro = SvSTATE_hv (hv);
2757 for (i = 0; i < len; ++i) 3509
2758 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3510 assert (!coro->invoke_cb);
3511 assert (!coro->invoke_av);
3512 coro->invoke_cb = SvREFCNT_inc (cb);
3513 coro->invoke_av = av;
2759 } 3514 }
3515
3516 api_ready (aTHX_ (SV *)hv);
3517
3518 if (GIMME_V != G_VOID)
3519 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3520 else
3521 SvREFCNT_dec (hv);
2760} 3522}
3523
3524SV *
3525rouse_cb ()
3526 PROTOTYPE:
3527 CODE:
3528 RETVAL = coro_new_rouse_cb (aTHX);
3529 OUTPUT:
3530 RETVAL
2761 3531
2762void 3532void
2763_pool_2 (SV *cb) 3533rouse_wait (...)
3534 PROTOTYPE: ;$
3535 PPCODE:
3536 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3537
3538void
3539on_enter (SV *block)
3540 ALIAS:
3541 on_leave = 1
3542 PROTOTYPE: &
2764 CODE: 3543 CODE:
2765{ 3544{
2766 HV *hv = (HV *)SvRV (coro_current);
2767 struct coro *coro = SvSTATE_hv ((SV *)hv); 3545 struct coro *coro = SvSTATE_current;
3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2768 3547
2769 sv_setsv (cb, &PL_sv_undef); 3548 block = s_get_cv_croak (block);
2770 3549
2771 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3550 if (!*avp)
2772 coro->saved_deffh = 0; 3551 *avp = newAV ();
2773 3552
2774 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3553 av_push (*avp, SvREFCNT_inc (block));
2775 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2776 {
2777 SV *old = PL_diehook;
2778 PL_diehook = 0;
2779 SvREFCNT_dec (old);
2780 croak ("\3async_pool terminate\2\n");
2781 }
2782 3554
2783 av_clear (GvAV (PL_defgv)); 3555 if (!ix)
2784 hv_store (hv, "desc", sizeof ("desc") - 1, 3556 on_enterleave_call (aTHX_ block);
2785 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2786 3557
2787 coro->prio = 0; 3558 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2788 3559 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2789 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3560 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2790 api_trace (aTHX_ coro_current, 0);
2791
2792 av_push (av_async_pool, newSVsv (coro_current));
2793} 3561}
2794 3562
2795 3563
2796MODULE = Coro::State PACKAGE = PerlIO::cede 3564MODULE = Coro::State PACKAGE = PerlIO::cede
2797 3565
… …
2800 3568
2801 3569
2802MODULE = Coro::State PACKAGE = Coro::Semaphore 3570MODULE = Coro::State PACKAGE = Coro::Semaphore
2803 3571
2804SV * 3572SV *
2805new (SV *klass, SV *count_ = 0) 3573new (SV *klass, SV *count = 0)
2806 CODE: 3574 CODE:
2807{ 3575{
2808 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3576 int semcnt = 1;
2809 AV *av = newAV ();
2810 SV **ary;
2811 3577
2812 /* unfortunately, building manually saves memory */ 3578 if (count)
2813 Newx (ary, 2, SV *); 3579 {
2814 AvALLOC (av) = ary; 3580 SvGETMAGIC (count);
2815 AvARRAY (av) = ary;
2816 AvMAX (av) = 1;
2817 AvFILLp (av) = 0;
2818 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2819 3581
2820 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3582 if (SvOK (count))
3583 semcnt = SvIV (count);
3584 }
3585
3586 RETVAL = sv_bless (
3587 coro_waitarray_new (aTHX_ semcnt),
3588 GvSTASH (CvGV (cv))
3589 );
2821} 3590}
3591 OUTPUT:
3592 RETVAL
3593
3594# helper for Coro::Channel and others
3595SV *
3596_alloc (int count)
3597 CODE:
3598 RETVAL = coro_waitarray_new (aTHX_ count);
2822 OUTPUT: 3599 OUTPUT:
2823 RETVAL 3600 RETVAL
2824 3601
2825SV * 3602SV *
2826count (SV *self) 3603count (SV *self)
… …
2835 adjust = 1 3612 adjust = 1
2836 CODE: 3613 CODE:
2837 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3614 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2838 3615
2839void 3616void
2840down (SV *self) 3617down (...)
2841 CODE: 3618 CODE:
2842 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3619 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
2843 3620
2844void 3621void
2845wait (SV *self) 3622wait (...)
2846 CODE: 3623 CODE:
2847 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3624 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2848 3625
2849void 3626void
2850try (SV *self) 3627try (SV *self)
… …
2864 XSRETURN_NO; 3641 XSRETURN_NO;
2865} 3642}
2866 3643
2867void 3644void
2868waiters (SV *self) 3645waiters (SV *self)
2869 CODE: 3646 PPCODE:
2870{ 3647{
2871 AV *av = (AV *)SvRV (self); 3648 AV *av = (AV *)SvRV (self);
3649 int wcount = AvFILLp (av) + 1 - 1;
2872 3650
2873 if (GIMME_V == G_SCALAR) 3651 if (GIMME_V == G_SCALAR)
2874 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3652 XPUSHs (sv_2mortal (newSViv (wcount)));
2875 else 3653 else
2876 { 3654 {
2877 int i; 3655 int i;
2878 EXTEND (SP, AvFILLp (av) + 1 - 1); 3656 EXTEND (SP, wcount);
2879 for (i = 1; i <= AvFILLp (av); ++i) 3657 for (i = 1; i <= wcount; ++i)
2880 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3658 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2881 } 3659 }
2882} 3660}
3661
3662MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3663
3664void
3665_may_delete (SV *sem, int count, int extra_refs)
3666 PPCODE:
3667{
3668 AV *av = (AV *)SvRV (sem);
3669
3670 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3671 && AvFILLp (av) == 0 /* no waiters, just count */
3672 && SvIV (AvARRAY (av)[0]) == count)
3673 XSRETURN_YES;
3674
3675 XSRETURN_NO;
3676}
3677
3678MODULE = Coro::State PACKAGE = Coro::Signal
3679
3680SV *
3681new (SV *klass)
3682 CODE:
3683 RETVAL = sv_bless (
3684 coro_waitarray_new (aTHX_ 0),
3685 GvSTASH (CvGV (cv))
3686 );
3687 OUTPUT:
3688 RETVAL
3689
3690void
3691wait (...)
3692 CODE:
3693 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3694
3695void
3696broadcast (SV *self)
3697 CODE:
3698{
3699 AV *av = (AV *)SvRV (self);
3700 coro_signal_wake (aTHX_ av, AvFILLp (av));
3701}
3702
3703void
3704send (SV *self)
3705 CODE:
3706{
3707 AV *av = (AV *)SvRV (self);
3708
3709 if (AvFILLp (av))
3710 coro_signal_wake (aTHX_ av, 1);
3711 else
3712 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3713}
3714
3715IV
3716awaited (SV *self)
3717 CODE:
3718 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3719 OUTPUT:
3720 RETVAL
2883 3721
2884 3722
2885MODULE = Coro::State PACKAGE = Coro::AnyEvent 3723MODULE = Coro::State PACKAGE = Coro::AnyEvent
2886 3724
2887BOOT: 3725BOOT:
… …
2915 3753
2916void 3754void
2917_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
2918 CODE: 3756 CODE:
2919{ 3757{
2920 HV *st; 3758 SV *req_cv = s_get_cv_croak (req);
2921 GV *gvp;
2922 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2923 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
2924 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2925 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
2926 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2927} 3763}
2928 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

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