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.289 by root, Mon Nov 17 08:25:06 2008 UTC vs.
Revision 1.365 by root, Mon Jul 20 16:18:30 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
… …
120#endif 67#endif
121 68
122/* The next macros try to return the current stack pointer, in an as 69/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 70 * portable way as possible. */
124#if __GNUC__ >= 4 71#if __GNUC__ >= 4
72# define dSTACKLEVEL int stacklevel_dummy
125# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 73# define STACKLEVEL __builtin_frame_address (0)
126#else 74#else
127# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
76# define STACKLEVEL ((void *)&stacklevel)
128#endif 77#endif
129 78
130#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
131 80
132#if __GNUC__ >= 3 81#if __GNUC__ >= 3
133# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
134# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
135# define INLINE static inline 84# define INLINE static inline
136#else 85#else
137# define attribute(x) 86# define attribute(x)
138# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
139# define INLINE static 88# define INLINE static
… …
143#define expect_true(expr) expect ((expr) != 0, 1) 92#define expect_true(expr) expect ((expr) != 0, 1)
144 93
145#define NOINLINE attribute ((noinline)) 94#define NOINLINE attribute ((noinline))
146 95
147#include "CoroAPI.h" 96#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */
148 98
149#ifdef USE_ITHREADS 99#ifdef USE_ITHREADS
150# if CORO_PTHREAD 100# if CORO_PTHREAD
151static void *coro_thx; 101static void *coro_thx;
152# endif 102# endif
153#endif 103#endif
154 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
155static 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]);
117
118/* we hijack an hopefully unused CV flag for our purposes */
119#define CVf_SLF 0x4000
120static OP *pp_slf (pTHX);
156 121
157static U32 cctx_gen; 122static U32 cctx_gen;
158static size_t cctx_stacksize = CORO_STACKSIZE; 123static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 124static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 126static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
165static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 136static SV *rv_diehook;
168static SV *rv_warnhook; 137static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
170 139
171/* async_pool helper stuff */ 140/* async_pool helper stuff */
172static SV *sv_pool_rss; 141static SV *sv_pool_rss;
173static SV *sv_pool_size; 142static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */
174static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
175 148
176/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
177static SV *sv_activity; 150static SV *sv_activity;
151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
178 157
179static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
180static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
181 160
182enum { 161enum {
… …
208 int valgrind_id; 187 int valgrind_id;
209#endif 188#endif
210 unsigned char flags; 189 unsigned char flags;
211} coro_cctx; 190} coro_cctx;
212 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
213enum { 196enum {
214 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
215 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
216 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
217 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218}; 202};
219 203
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 205typedef struct
222{ 206{
223 SV *defsv; 207 SV *defsv;
224 AV *defav; 208 AV *defav;
225 SV *errsv; 209 SV *errsv;
226 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
227#define VAR(name,type) type name; 212#define VAR(name,type) type name;
228# include "state.h" 213# include "state.h"
229#undef VAR 214#undef VAR
230} perl_slots; 215} perl_slots;
231 216
… …
234/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
235struct coro { 220struct coro {
236 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
237 coro_cctx *cctx; 222 coro_cctx *cctx;
238 223
224 /* ready queue */
225 struct coro *next_ready;
226
239 /* state data */ 227 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 229 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
243 231
232 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */ 234 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 235 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 236 HV *hv; /* the perl hash associated with this coro, if any */
248 void (*on_destroy)(pTHX_ struct coro *coro); 237 void (*on_destroy)(pTHX_ struct coro *coro);
249 238
250 /* statistics */ 239 /* statistics */
251 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
252 241
253 /* coro process data */ 242 /* coro process data */
254 int prio; 243 int prio;
255 SV *throw; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
245 SV *rouse_cb;
256 246
257 /* async_pool */ 247 /* async_pool */
258 SV *saved_deffh; 248 SV *saved_deffh;
249 SV *invoke_cb;
250 AV *invoke_av;
251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
259 258
260 /* linked list */ 259 /* linked list */
261 struct coro *next, *prev; 260 struct coro *next, *prev;
262}; 261};
263 262
… …
266 265
267/* the following variables are effectively part of the perl context */ 266/* the following variables are effectively part of the perl context */
268/* and get copied between struct coro and these variables */ 267/* and get copied between struct coro and these variables */
269/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
270static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
271static SV *coro_throw;
272 270
273/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
274 272
275#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
276#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
277#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
278#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
279#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
280#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
281 279
282/* for Coro.pm */ 280/* for Coro.pm */
283static SV *coro_current; 281static SV *coro_current;
284static SV *coro_readyhook; 282static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate;
286static struct coro *coro_first; 285static struct coro *coro_first;
287#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
288 307
289/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
290 309
291static SV * 310static SV *
292coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
316 get_hv (name, create); 335 get_hv (name, create);
317#endif 336#endif
318 return get_hv (name, create); 337 return get_hv (name, create);
319} 338}
320 339
340INLINE void
341coro_times_update ()
342{
343#ifdef coro_clock_gettime
344 struct timespec ts;
345
346 ts.tv_sec = ts.tv_nsec = 0;
347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
349
350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
385}
386
387/*****************************************************************************/
388/* magic glue */
389
390#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext
392
393#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \
396 : mg_find (sv, type))
397
398#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \
401 : 0)
402
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405
406INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro)
408{
409 HV *stash;
410 MAGIC *mg;
411
412 if (SvROK (coro))
413 coro = SvRV (coro);
414
415 if (expect_false (SvTYPE (coro) != SVt_PVHV))
416 croak ("Coro::State object required");
417
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr;
428}
429
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431
432/* faster than SvSTATE, but expects a coroutine hv */
433#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435
436/*****************************************************************************/
437/* padlist management and caching */
438
321static AV * 439static AV *
322coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
323{ 441{
324 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
325 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
326 444
327 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
332 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
333#endif 451#endif
334 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
335 --AvFILLp (padlist); 453 --AvFILLp (padlist);
336 454
337 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
338 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
339 457
340 return newpadlist; 458 return newpadlist;
341} 459}
342 460
343static void 461static void
344free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
345{ 463{
346 /* may be during global destruction */ 464 /* may be during global destruction */
347 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
348 { 466 {
349 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
350 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
351 { 470 {
352 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
353 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
354 { 473 I32 j = AvFILLp (av);
355 SV *sv; 474
356 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
357 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
358
359 SvREFCNT_dec (*svp);
360 }
361 } 480 }
362 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
363 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
364 } 486 }
365} 487}
366 488
367static int 489static int
368coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
369{ 491{
370 AV *padlist; 492 AV *padlist;
371 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
372 498
373 /* casting is fun. */ 499 /* casting is fun. */
374 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
375 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
376 502
377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
378 504
379 return 0; 505 return 0;
380} 506}
381
382#define CORO_MAGIC_type_cv 26
383#define CORO_MAGIC_type_state PERL_MAGIC_ext
384 507
385static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
386 0, 0, 0, 0, 509 0, 0, 0, 0,
387 coro_cv_free 510 coro_cv_free
388}; 511};
389
390#define CORO_MAGIC_NN(sv, type) \
391 (expect_true (SvMAGIC (sv)->mg_type == type) \
392 ? SvMAGIC (sv) \
393 : mg_find (sv, type))
394
395#define CORO_MAGIC(sv, type) \
396 (expect_true (SvMAGIC (sv)) \
397 ? CORO_MAGIC_NN (sv, type) \
398 : 0)
399
400#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
401#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
402
403INLINE struct coro *
404SvSTATE_ (pTHX_ SV *coro)
405{
406 HV *stash;
407 MAGIC *mg;
408
409 if (SvROK (coro))
410 coro = SvRV (coro);
411
412 if (expect_false (SvTYPE (coro) != SVt_PVHV))
413 croak ("Coro::State object required");
414
415 stash = SvSTASH (coro);
416 if (expect_false (stash != coro_stash && stash != coro_state_stash))
417 {
418 /* very slow, but rare, check */
419 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
420 croak ("Coro::State object required");
421 }
422
423 mg = CORO_MAGIC_state (coro);
424 return (struct coro *)mg->mg_ptr;
425}
426
427#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
428
429/* faster than SvSTATE, but expects a coroutine hv */
430#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
431#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
432 512
433/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
434static void 514static void
435get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
436{ 516{
… …
442 else 522 else
443 { 523 {
444#if CORO_PREFER_PERL_FUNCTIONS 524#if CORO_PREFER_PERL_FUNCTIONS
445 /* this is probably cleaner? but also slower! */ 525 /* this is probably cleaner? but also slower! */
446 /* in practise, it seems to be less stable */ 526 /* in practise, it seems to be less stable */
447 CV *cp = Perl_cv_clone (cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
448 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
449 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
450 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
451#else 531#else
452 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
453#endif 533#endif
454 } 534 }
455} 535}
456 536
457static void 537static void
… …
464 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
465 545
466 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
467 547
468 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
469 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
470 550
471 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
472} 552}
473 553
474/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
475 558
476static void 559static void
477load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
478{ 561{
479 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
480 c->slot = 0; 563 c->slot = 0;
481 564
482 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
483 566
484 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
485 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
486 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
487 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
488 572
489 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
490 # include "state.h" 574 # include "state.h"
491 #undef VAR 575 #undef VAR
492 576
… …
505 589
506 PUTBACK; 590 PUTBACK;
507 } 591 }
508 592
509 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
510 coro_throw = c->throw; 594 CORO_THROW = c->except;
595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
604 if (expect_false (c->on_enter))
605 {
606 int i;
607
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 }
511} 611}
512 612
513static void 613static void
514save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
515{ 615{
516 c->throw = coro_throw; 616 if (expect_false (c->on_leave))
617 {
618 int i;
619
620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
630 }
631
632 c->except = CORO_THROW;
517 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
518 634
519 { 635 {
520 dSP; 636 dSP;
521 I32 cxix = cxstack_ix; 637 I32 cxix = cxstack_ix;
… …
533 { 649 {
534 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
535 { 651 {
536 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
537 653
538 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
539 { 655 {
540 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
541 657
542 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
543 { 659 {
… …
567 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
568 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
569 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
570 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
571 { 687 {
572 int i; 688 unsigned int i;
573 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
574 CXINC; 690 CXINC;
575 } 691 }
576 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
577 693
578 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
579 695
580 { 696 {
581 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
582 698
583 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
584 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
585 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
586 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
587 704
588 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
589 # include "state.h" 706 # include "state.h"
590 #undef VAR 707 #undef VAR
591 } 708 }
… …
596 * of perl.c:init_stacks, except that it uses less memory 713 * of perl.c:init_stacks, except that it uses less memory
597 * on the (sometimes correct) assumption that coroutines do 714 * on the (sometimes correct) assumption that coroutines do
598 * not usually need a lot of stackspace. 715 * not usually need a lot of stackspace.
599 */ 716 */
600#if CORO_PREFER_PERL_FUNCTIONS 717#if CORO_PREFER_PERL_FUNCTIONS
601# define coro_init_stacks init_stacks 718# define coro_init_stacks(thx) init_stacks ()
602#else 719#else
603static void 720static void
604coro_init_stacks (pTHX) 721coro_init_stacks (pTHX)
605{ 722{
606 PL_curstackinfo = new_stackinfo(32, 8); 723 PL_curstackinfo = new_stackinfo(32, 8);
… …
669#if !PERL_VERSION_ATLEAST (5,10,0) 786#if !PERL_VERSION_ATLEAST (5,10,0)
670 Safefree (PL_retstack); 787 Safefree (PL_retstack);
671#endif 788#endif
672} 789}
673 790
791#define CORO_RSS \
792 rss += sizeof (SYM (curstackinfo)); \
793 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
794 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
795 rss += SYM (tmps_max) * sizeof (SV *); \
796 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
797 rss += SYM (scopestack_max) * sizeof (I32); \
798 rss += SYM (savestack_max) * sizeof (ANY);
799
674static size_t 800static size_t
675coro_rss (pTHX_ struct coro *coro) 801coro_rss (pTHX_ struct coro *coro)
676{ 802{
677 size_t rss = sizeof (*coro); 803 size_t rss = sizeof (*coro);
678 804
679 if (coro->mainstack) 805 if (coro->mainstack)
680 { 806 {
681 perl_slots tmp_slot;
682 perl_slots *slot;
683
684 if (coro->flags & CF_RUNNING) 807 if (coro->flags & CF_RUNNING)
685 { 808 {
686 slot = &tmp_slot; 809 #define SYM(sym) PL_ ## sym
687 810 CORO_RSS;
688 #define VAR(name,type) slot->name = PL_ ## name;
689 # include "state.h"
690 #undef VAR 811 #undef SYM
691 } 812 }
692 else 813 else
693 slot = coro->slot;
694
695 if (slot)
696 { 814 {
697 rss += sizeof (slot->curstackinfo); 815 #define SYM(sym) coro->slot->sym
698 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 816 CORO_RSS;
699 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 817 #undef SYM
700 rss += slot->tmps_max * sizeof (SV *);
701 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
702 rss += slot->scopestack_max * sizeof (I32);
703 rss += slot->savestack_max * sizeof (ANY);
704
705#if !PERL_VERSION_ATLEAST (5,10,0)
706 rss += slot->retstack_max * sizeof (OP *);
707#endif
708 } 818 }
709 } 819 }
710 820
711 return rss; 821 return rss;
712} 822}
… …
725#endif 835#endif
726 836
727/* 837/*
728 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
729 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
730 * and instead of tryign to save and restore the hash elements, we just provide 840 * and instead of trying to save and restore the hash elements, we just provide
731 * readback here. 841 * readback here.
732 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
733 * not expecting this to actually change the hook. This is a potential problem
734 * when a schedule happens then, but we ignore this.
735 */ 842 */
736static int 843static int
737coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
738{ 845{
739 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
792 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
793 900
794 if (svp) 901 if (svp)
795 { 902 {
796 SV *old = *svp; 903 SV *old = *svp;
797 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
798 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
799 return 0; 906 return 0;
800 } 907 }
801 } 908 }
802 909
… …
813static int 920static int
814slf_check_nop (pTHX_ struct CoroSLF *frame) 921slf_check_nop (pTHX_ struct CoroSLF *frame)
815{ 922{
816 return 0; 923 return 0;
817} 924}
925
926static int
927slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{
929 return 1;
930}
931
932static UNOP coro_setup_op;
818 933
819static void NOINLINE /* noinline to keep it out of the transfer fast path */ 934static void NOINLINE /* noinline to keep it out of the transfer fast path */
820coro_setup (pTHX_ struct coro *coro) 935coro_setup (pTHX_ struct coro *coro)
821{ 936{
822 /* 937 /*
… …
826 941
827 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
828 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
829 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
830 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
831 PL_curpm = 0; 949 PL_curpm = 0;
832 PL_curpad = 0; 950 PL_curpad = 0;
833 PL_localizing = 0; 951 PL_localizing = 0;
834 PL_dirty = 0; 952 PL_dirty = 0;
835 PL_restartop = 0; 953 PL_restartop = 0;
836#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
837 PL_parser = 0; 955 PL_parser = 0;
838#endif 956#endif
957 PL_hints = 0;
839 958
840 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
841 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
842 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
843 962
844 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
845 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
846 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
847 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0;
848 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
849 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
850 970
851 { 971 {
852 dSP; 972 dSP;
853 UNOP myop; 973 UNOP myop;
854 974
855 Zero (&myop, 1, UNOP); 975 Zero (&myop, 1, UNOP);
856 myop.op_next = Nullop; 976 myop.op_next = Nullop;
977 myop.op_type = OP_ENTERSUB;
857 myop.op_flags = OPf_WANT_VOID; 978 myop.op_flags = OPf_WANT_VOID;
858 979
859 PUSHMARK (SP); 980 PUSHMARK (SP);
860 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 981 PUSHs ((SV *)coro->startcv);
861 PUTBACK; 982 PUTBACK;
862 PL_op = (OP *)&myop; 983 PL_op = (OP *)&myop;
863 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 984 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
864 SPAGAIN;
865 } 985 }
866 986
867 /* this newly created coroutine might be run on an existing cctx which most 987 /* this newly created coroutine might be run on an existing cctx which most
868 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
869 */ 989 */
870 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
871 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
872 992
873 coro_throw = coro->throw; 993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
874} 994 coro_setup_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf;
997 /* no flags etc. required, as an init function won't be called */
875 998
999 PL_op = (OP *)&coro_setup_op;
1000
1001 /* copy throw, in case it was set before coro_setup */
1002 CORO_THROW = coro->except;
1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
876static void 1011static void
877coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
878{ 1013{
879 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
880 { 1015 {
881 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
882 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
890 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
891 1026
892 /* unwind main stack */ 1027 /* unwind main stack */
893 dounwind (-1); 1028 dounwind (-1);
894 } 1029 }
1030}
895 1031
896 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
897 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
898 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
899 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
900 SvREFCNT_dec (PL_rs);
901 SvREFCNT_dec (GvSV (irsgv));
902 1036
903 SvREFCNT_dec (PL_diehook);
904 SvREFCNT_dec (PL_warnhook);
905 1037 {
1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
1047
1048 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs;
1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1059
1060 load_perl (aTHX_ current);
1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
906 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
907 SvREFCNT_dec (coro_throw); 1070 SvREFCNT_dec (coro->rouse_cb);
908 1071 SvREFCNT_dec (coro->invoke_cb);
909 coro_destruct_stacks (aTHX); 1072 SvREFCNT_dec (coro->invoke_av);
1073 }
910} 1074}
911 1075
912INLINE void 1076INLINE void
913free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
914{ 1078{
… …
922static int 1086static int
923runops_trace (pTHX) 1087runops_trace (pTHX)
924{ 1088{
925 COP *oldcop = 0; 1089 COP *oldcop = 0;
926 int oldcxix = -2; 1090 int oldcxix = -2;
927 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
928 coro_cctx *cctx = coro->cctx;
929 1091
930 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
931 { 1093 {
932 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
933 1095
934 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
935 { 1097 {
936 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1098 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
937 { 1099 {
938 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
939 SV **bot, **top; 1101 SV **bot, **top;
940 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
941 SV **cb; 1103 SV **cb;
… …
978 1140
979 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
980 { 1142 {
981 SV **cb; 1143 SV **cb;
982 1144
983 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
984 { 1146 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 1148
987 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
988 { 1150 {
989 runops_proc_t old_runops = PL_runops;
990 dSP; 1151 dSP;
991 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
992 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
993 1154
994 if (isGV (gv)) 1155 if (isGV (gv))
… …
999 SAVETMPS; 1160 SAVETMPS;
1000 EXTEND (SP, 3); 1161 EXTEND (SP, 3);
1001 PUSHMARK (SP); 1162 PUSHMARK (SP);
1002 PUSHs (&PL_sv_yes); 1163 PUSHs (&PL_sv_yes);
1003 PUSHs (fullname); 1164 PUSHs (fullname);
1004 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1165 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1005 PUTBACK; 1166 PUTBACK;
1006 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1167 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1007 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1168 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1008 SPAGAIN; 1169 SPAGAIN;
1009 FREETMPS; 1170 FREETMPS;
… …
1012 } 1173 }
1013 1174
1014 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1015 } 1176 }
1016 1177
1017 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1018 { 1179 {
1019 dSP; 1180 dSP;
1020 1181
1021 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1022 ENTER; 1183 ENTER;
… …
1041 1202
1042 TAINT_NOT; 1203 TAINT_NOT;
1043 return 0; 1204 return 0;
1044} 1205}
1045 1206
1207static struct CoroSLF cctx_ssl_frame;
1208
1046static void 1209static void
1047prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1048{ 1211{
1049 ta->prev = (struct coro *)cctx;
1050 ta->next = 0; 1212 ta->prev = 0;
1051} 1213}
1052 1214
1053/* inject a fake call to Coro::State::_cctx_init into the execution */ 1215static int
1054/* _cctx_init should be careful, as it could be called at almost any time */ 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1055/* during execution of a perl program */ 1217{
1056/* also initialises PL_top_env */ 1218 *frame = cctx_ssl_frame;
1219
1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1221}
1222
1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1057static void NOINLINE 1224static void NOINLINE
1058cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1059{ 1226{
1060 dSP;
1061 UNOP myop;
1062
1063 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1064 1228
1065 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1066 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1067 1231
1068 Zero (&myop, 1, UNOP); 1232 /* we already must be executing an SLF op, there is no other valid way
1069 myop.op_next = PL_op; 1233 * that can lead to creation of a new cctx */
1070 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1234 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1071 1236
1072 PUSHMARK (SP); 1237 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1073 EXTEND (SP, 2); 1238 cctx_ssl_frame = slf_frame;
1074 PUSHs (sv_2mortal (newSViv ((IV)cctx))); 1239
1075 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1076 PUTBACK; 1241 slf_frame.check = slf_check_set_stacklevel;
1077 PL_op = (OP *)&myop;
1078 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1079 SPAGAIN;
1080} 1242}
1081 1243
1082/* the tail of transfer: execute stuff we can only do after a transfer */ 1244/* the tail of transfer: execute stuff we can only do after a transfer */
1083INLINE void 1245INLINE void
1084transfer_tail (pTHX) 1246transfer_tail (pTHX)
… …
1103 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1104 /* not doing so will re-execute it, which is exactly what we want */ 1266 /* not doing so will re-execute it, which is exactly what we want */
1105 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1106 1268
1107 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1108 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1109 1271
1110 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1111 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1112 1274
1113 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1114 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1115 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1278 /*
1279 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these
1281 */
1116 1282
1117 /* 1283 /*
1118 * 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
1119 * 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)
1120 * 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
1121 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1122 * 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.
1123 */ 1291 */
1124 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1125 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 */
1126 } 1294 }
1127} 1295}
… …
1204cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1205{ 1373{
1206 if (!cctx) 1374 if (!cctx)
1207 return; 1375 return;
1208 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1209 --cctx_count; 1379 --cctx_count;
1210 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1211 1381
1212 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1213 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1276 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1277 1447
1278 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1279 { 1449 {
1280 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1281 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,");
1282 1452
1283 if (expect_false (next->flags & CF_RUNNING))
1284 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1285
1286 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1287 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,");
1288 1455
1289#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1290 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1291 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,");
1292#endif 1459#endif
… …
1298transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1299{ 1466{
1300 dSTACKLEVEL; 1467 dSTACKLEVEL;
1301 1468
1302 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1303 if (expect_false (!next)) 1470 if (expect_false (!prev))
1304 { 1471 {
1305 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1472 cctx_current->idle_sp = STACKLEVEL;
1306 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 */
1307 } 1474 }
1308 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1309 { 1476 {
1310 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1311 1478
1312 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1313 { 1480 {
1314 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1315 prev->cctx = cctx_new_empty ();
1316 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1317 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1318 } 1484 }
1319 1485
1320 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1331 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1332 } 1498 }
1333 else 1499 else
1334 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1335 1501
1336 prev__cctx = prev->cctx;
1337
1338 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1339 if (expect_true ( 1503 if (expect_true (
1340 prev__cctx->idle_sp == (void *)stacklevel 1504 cctx_current->idle_sp == STACKLEVEL
1341 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1342 && !force_cctx 1506 && !force_cctx
1343 )) 1507 ))
1344 { 1508 {
1345 /* 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 */
1346 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));
1347 1511
1348 prev->cctx = 0;
1349
1350 /* 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. */
1351 /* 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 */
1352 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1353 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1354 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1355 1517
1356 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1357 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1358 1522
1359 ++next->usecount; 1523 ++next->usecount;
1360 1524
1361 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1362 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1363 1527
1364 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1365 { 1531 {
1366 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1367 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1368 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1369 } 1535 }
1370 1536
1371 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1372 } 1538 }
1373} 1539}
… …
1381coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1382{ 1548{
1383 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1384 return 0; 1550 return 0;
1385 1551
1386 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1387 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1388 1554
1389 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1390 1556
1391 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1395 --coro_nready; 1561 --coro_nready;
1396 } 1562 }
1397 else 1563 else
1398 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 */
1399 1565
1400 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1401 { 1567 && coro->mainstack != main_mainstack
1402 struct coro temp; 1568 && coro->slot
1403 1569 && !PL_dirty)
1404 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1405
1406 save_perl (aTHX_ &temp);
1407 load_perl (aTHX_ coro);
1408
1409 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1410
1411 load_perl (aTHX_ &temp);
1412
1413 coro->slot = 0;
1414 }
1415 1571
1416 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv);
1417 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1575 SvREFCNT_dec (CORO_THROW);
1418 1576
1419 if (coro->next) coro->next->prev = coro->prev; 1577 if (coro->next) coro->next->prev = coro->prev;
1420 if (coro->prev) coro->prev->next = coro->next; 1578 if (coro->prev) coro->prev->next = coro->next;
1421 if (coro == coro_first) coro_first = coro->next; 1579 if (coro == coro_first) coro_first = coro->next;
1422 1580
… …
1481/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1482 1640
1483INLINE void 1641INLINE void
1484coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1485{ 1643{
1486 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1487}
1488 1645
1489INLINE 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 *
1490coro_deq (pTHX) 1654coro_deq (pTHX)
1491{ 1655{
1492 int prio; 1656 int prio;
1493 1657
1494 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1495 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1496 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 }
1497 1669
1498 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;
1499} 1688}
1500 1689
1501static int 1690static int
1502api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1503{ 1692{
1504 struct coro *coro;
1505 SV *sv_hook;
1506 void (*xs_hook)(void);
1507
1508 if (SvROK (coro_sv))
1509 coro_sv = SvRV (coro_sv);
1510
1511 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1512 1694
1513 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1514 return 0; 1696 return 0;
1515 1697
1516 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1517 1699
1518 sv_hook = coro_nready ? 0 : coro_readyhook;
1519 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1520
1521 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1522 ++coro_nready;
1523 1701
1524 if (sv_hook) 1702 if (!coro_nready++)
1525 { 1703 if (coroapi.readyhook)
1526 dSP; 1704 coroapi.readyhook ();
1527
1528 ENTER;
1529 SAVETMPS;
1530
1531 PUSHMARK (SP);
1532 PUTBACK;
1533 call_sv (sv_hook, G_DISCARD);
1534 SPAGAIN;
1535
1536 FREETMPS;
1537 LEAVE;
1538 }
1539
1540 if (xs_hook)
1541 xs_hook ();
1542 1705
1543 return 1; 1706 return 1;
1544} 1707}
1545 1708
1546static int 1709static int
1547api_is_ready (pTHX_ SV *coro_sv) 1710api_is_ready (pTHX_ SV *coro_sv)
1548{ 1711{
1549 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1712 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1550} 1713}
1551 1714
1715/* expects to own a reference to next->hv */
1552INLINE void 1716INLINE void
1553prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1554{ 1718{
1555 SV *prev_sv, *next_sv;
1556
1557 for (;;)
1558 {
1559 next_sv = coro_deq (aTHX);
1560
1561 /* nothing to schedule: call the idle handler */
1562 if (expect_false (!next_sv))
1563 {
1564 dSP;
1565
1566 ENTER;
1567 SAVETMPS;
1568
1569 PUSHMARK (SP);
1570 PUTBACK;
1571 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1572 SPAGAIN;
1573
1574 FREETMPS;
1575 LEAVE;
1576 continue;
1577 }
1578
1579 ta->next = SvSTATE_hv (next_sv);
1580
1581 /* cannot transfer to destroyed coros, skip and look for next */
1582 if (expect_false (ta->next->flags & CF_DESTROYED))
1583 {
1584 SvREFCNT_dec (next_sv);
1585 /* coro_nready has already been taken care of by destroy */
1586 continue;
1587 }
1588
1589 --coro_nready;
1590 break;
1591 }
1592
1593 /* free this only after the transfer */
1594 prev_sv = SvRV (coro_current); 1719 SV *prev_sv = SvRV (coro_current);
1720
1595 ta->prev = SvSTATE_hv (prev_sv); 1721 ta->prev = SvSTATE_hv (prev_sv);
1722 ta->next = next;
1723
1596 TRANSFER_CHECK (*ta); 1724 TRANSFER_CHECK (*ta);
1597 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1725
1598 ta->next->flags &= ~CF_READY;
1599 SvRV_set (coro_current, next_sv); 1726 SvRV_set (coro_current, (SV *)next->hv);
1600 1727
1601 free_coro_mortal (aTHX); 1728 free_coro_mortal (aTHX);
1602 coro_mortal = prev_sv; 1729 coro_mortal = prev_sv;
1603} 1730}
1604 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 dSP;
1766
1767 ENTER;
1768 SAVETMPS;
1769
1770 PUSHMARK (SP);
1771 PUTBACK;
1772 call_sv (sv_idle, G_VOID | G_DISCARD);
1773
1774 FREETMPS;
1775 LEAVE;
1776 }
1777 }
1778 }
1779}
1780
1605INLINE void 1781INLINE void
1606prepare_cede (pTHX_ struct coro_transfer_args *ta) 1782prepare_cede (pTHX_ struct coro_transfer_args *ta)
1607{ 1783{
1608 api_ready (aTHX_ coro_current); 1784 api_ready (aTHX_ coro_current);
1609 prepare_schedule (aTHX_ ta); 1785 prepare_schedule (aTHX_ ta);
… …
1628{ 1804{
1629 struct coro_transfer_args ta; 1805 struct coro_transfer_args ta;
1630 1806
1631 prepare_schedule (aTHX_ &ta); 1807 prepare_schedule (aTHX_ &ta);
1632 TRANSFER (ta, 1); 1808 TRANSFER (ta, 1);
1809}
1810
1811static void
1812api_schedule_to (pTHX_ SV *coro_sv)
1813{
1814 struct coro_transfer_args ta;
1815 struct coro *next = SvSTATE (coro_sv);
1816
1817 SvREFCNT_inc_NN (coro_sv);
1818 prepare_schedule_to (aTHX_ &ta, next);
1633} 1819}
1634 1820
1635static int 1821static int
1636api_cede (pTHX) 1822api_cede (pTHX)
1637{ 1823{
… …
1666static void 1852static void
1667api_trace (pTHX_ SV *coro_sv, int flags) 1853api_trace (pTHX_ SV *coro_sv, int flags)
1668{ 1854{
1669 struct coro *coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1670 1856
1857 if (coro->flags & CF_RUNNING)
1858 croak ("cannot enable tracing on a running coroutine, caught");
1859
1671 if (flags & CC_TRACE) 1860 if (flags & CC_TRACE)
1672 { 1861 {
1673 if (!coro->cctx) 1862 if (!coro->cctx)
1674 coro->cctx = cctx_new_run (); 1863 coro->cctx = cctx_new_run ();
1675 else if (!(coro->cctx->flags & CC_TRACE)) 1864 else if (!(coro->cctx->flags & CC_TRACE))
1676 croak ("cannot enable tracing on coroutine with custom stack,"); 1865 croak ("cannot enable tracing on coroutine with custom stack, caught");
1677 1866
1678 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1867 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1679 } 1868 }
1680 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1869 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1681 { 1870 {
… …
1684 if (coro->flags & CF_RUNNING) 1873 if (coro->flags & CF_RUNNING)
1685 PL_runops = RUNOPS_DEFAULT; 1874 PL_runops = RUNOPS_DEFAULT;
1686 else 1875 else
1687 coro->slot->runops = RUNOPS_DEFAULT; 1876 coro->slot->runops = RUNOPS_DEFAULT;
1688 } 1877 }
1878}
1879
1880static void
1881coro_call_on_destroy (pTHX_ struct coro *coro)
1882{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885
1886 if (on_destroyp)
1887 {
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889
1890 while (AvFILLp (on_destroy) >= 0)
1891 {
1892 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP);
1896
1897 if (statusp)
1898 {
1899 int i;
1900 AV *status = (AV *)SvRV (*statusp);
1901 EXTEND (SP, AvFILLp (status) + 1);
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 }
1906
1907 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1909 }
1910 }
1911}
1912
1913static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{
1916 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919
1920 av_extend (av, items - 1);
1921 for (i = 0; i < items; ++i)
1922 av_push (av, SvREFCNT_inc_NN (arg [i]));
1923
1924 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1925
1926 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1927 api_ready (aTHX_ sv_manager);
1928
1929 frame->prepare = prepare_schedule;
1930 frame->check = slf_check_repeat;
1931
1932 /* as a minor optimisation, we could unwind all stacks here */
1933 /* but that puts extra pressure on pp_slf, and is not worth much */
1934 /*coro_unwind_stacks (aTHX);*/
1935}
1936
1937/*****************************************************************************/
1938/* async pool handler */
1939
1940static int
1941slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1942{
1943 HV *hv = (HV *)SvRV (coro_current);
1944 struct coro *coro = (struct coro *)frame->data;
1945
1946 if (!coro->invoke_cb)
1947 return 1; /* loop till we have invoke */
1948 else
1949 {
1950 hv_store (hv, "desc", sizeof ("desc") - 1,
1951 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1952
1953 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1954
1955 {
1956 dSP;
1957 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1958 PUTBACK;
1959 }
1960
1961 SvREFCNT_dec (GvAV (PL_defgv));
1962 GvAV (PL_defgv) = coro->invoke_av;
1963 coro->invoke_av = 0;
1964
1965 return 0;
1966 }
1967}
1968
1969static void
1970slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1971{
1972 HV *hv = (HV *)SvRV (coro_current);
1973 struct coro *coro = SvSTATE_hv ((SV *)hv);
1974
1975 if (expect_true (coro->saved_deffh))
1976 {
1977 /* subsequent iteration */
1978 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1979 coro->saved_deffh = 0;
1980
1981 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1982 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1983 {
1984 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1985 coro->invoke_av = newAV ();
1986
1987 frame->prepare = prepare_nop;
1988 }
1989 else
1990 {
1991 av_clear (GvAV (PL_defgv));
1992 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1993
1994 coro->prio = 0;
1995
1996 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1997 api_trace (aTHX_ coro_current, 0);
1998
1999 frame->prepare = prepare_schedule;
2000 av_push (av_async_pool, SvREFCNT_inc (hv));
2001 }
2002 }
2003 else
2004 {
2005 /* first iteration, simply fall through */
2006 frame->prepare = prepare_nop;
2007 }
2008
2009 frame->check = slf_check_pool_handler;
2010 frame->data = (void *)coro;
2011}
2012
2013/*****************************************************************************/
2014/* rouse callback */
2015
2016#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2017
2018static void
2019coro_rouse_callback (pTHX_ CV *cv)
2020{
2021 dXSARGS;
2022 SV *data = (SV *)S_GENSUB_ARG;
2023
2024 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2025 {
2026 /* first call, set args */
2027 SV *coro = SvRV (data);
2028 AV *av = newAV ();
2029
2030 SvRV_set (data, (SV *)av);
2031
2032 /* better take a full copy of the arguments */
2033 while (items--)
2034 av_store (av, items, newSVsv (ST (items)));
2035
2036 api_ready (aTHX_ coro);
2037 SvREFCNT_dec (coro);
2038 }
2039
2040 XSRETURN_EMPTY;
2041}
2042
2043static int
2044slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2045{
2046 SV *data = (SV *)frame->data;
2047
2048 if (CORO_THROW)
2049 return 0;
2050
2051 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2052 return 1;
2053
2054 /* now push all results on the stack */
2055 {
2056 dSP;
2057 AV *av = (AV *)SvRV (data);
2058 int i;
2059
2060 EXTEND (SP, AvFILLp (av) + 1);
2061 for (i = 0; i <= AvFILLp (av); ++i)
2062 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2063
2064 /* we have stolen the elements, so set length to zero and free */
2065 AvFILLp (av) = -1;
2066 av_undef (av);
2067
2068 PUTBACK;
2069 }
2070
2071 return 0;
2072}
2073
2074static void
2075slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2076{
2077 SV *cb;
2078
2079 if (items)
2080 cb = arg [0];
2081 else
2082 {
2083 struct coro *coro = SvSTATE_current;
2084
2085 if (!coro->rouse_cb)
2086 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2087
2088 cb = sv_2mortal (coro->rouse_cb);
2089 coro->rouse_cb = 0;
2090 }
2091
2092 if (!SvROK (cb)
2093 || SvTYPE (SvRV (cb)) != SVt_PVCV
2094 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2095 croak ("Coro::rouse_wait called with illegal callback argument,");
2096
2097 {
2098 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2099 SV *data = (SV *)S_GENSUB_ARG;
2100
2101 frame->data = (void *)data;
2102 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2103 frame->check = slf_check_rouse_wait;
2104 }
2105}
2106
2107static SV *
2108coro_new_rouse_cb (pTHX)
2109{
2110 HV *hv = (HV *)SvRV (coro_current);
2111 struct coro *coro = SvSTATE_hv (hv);
2112 SV *data = newRV_inc ((SV *)hv);
2113 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2114
2115 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2116 SvREFCNT_dec (data); /* magicext increases the refcount */
2117
2118 SvREFCNT_dec (coro->rouse_cb);
2119 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2120
2121 return cb;
1689} 2122}
1690 2123
1691/*****************************************************************************/ 2124/*****************************************************************************/
1692/* schedule-like-function opcode (SLF) */ 2125/* schedule-like-function opcode (SLF) */
1693 2126
… …
1717 2150
1718 RETURNOP (slf_restore.op_first); 2151 RETURNOP (slf_restore.op_first);
1719} 2152}
1720 2153
1721static void 2154static void
1722slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1723{
1724 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1725}
1726
1727static void
1728slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1729{
1730 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1731
1732 frame->prepare = slf_prepare_set_stacklevel;
1733 frame->check = slf_check_nop;
1734 frame->data = (void *)SvIV (arg [0]);
1735}
1736
1737static void
1738slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta) 2155slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1739{ 2156{
1740 SV **arg = (SV **)slf_frame.data; 2157 SV **arg = (SV **)slf_frame.data;
1741 2158
1742 prepare_transfer (aTHX_ ta, arg [0], arg [1]); 2159 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
… …
1759 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1760 frame->check = slf_check_nop; 2177 frame->check = slf_check_nop;
1761} 2178}
1762 2179
1763static void 2180static void
2181slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2182{
2183 struct coro *next = (struct coro *)slf_frame.data;
2184
2185 SvREFCNT_inc_NN (next->hv);
2186 prepare_schedule_to (aTHX_ ta, next);
2187}
2188
2189static void
2190slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2191{
2192 if (!items)
2193 croak ("Coro::schedule_to expects a coroutine argument, caught");
2194
2195 frame->data = (void *)SvSTATE (arg [0]);
2196 frame->prepare = slf_prepare_schedule_to;
2197 frame->check = slf_check_nop;
2198}
2199
2200static void
2201slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2202{
2203 api_ready (aTHX_ SvRV (coro_current));
2204
2205 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2206}
2207
2208static void
1764slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2209slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1765{ 2210{
1766 frame->prepare = prepare_cede; 2211 frame->prepare = prepare_cede;
1767 frame->check = slf_check_nop; 2212 frame->check = slf_check_nop;
1768} 2213}
… …
1771slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2216slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1772{ 2217{
1773 frame->prepare = prepare_cede_notself; 2218 frame->prepare = prepare_cede_notself;
1774 frame->check = slf_check_nop; 2219 frame->check = slf_check_nop;
1775} 2220}
1776
1777/* we hijack an hopefully unused CV flag for our purposes */
1778#define CVf_SLF 0x4000
1779 2221
1780/* 2222/*
1781 * these not obviously related functions are all rolled into one 2223 * these not obviously related functions are all rolled into one
1782 * function to increase chances that they all will call transfer with the same 2224 * function to increase chances that they all will call transfer with the same
1783 * stack offset 2225 * stack offset
… …
1839 } 2281 }
1840 while (slf_frame.check (aTHX_ &slf_frame)); 2282 while (slf_frame.check (aTHX_ &slf_frame));
1841 2283
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2284 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843 2285
1844 /* return value handling - mostly like entersub */
1845 {
1846 dSP;
1847 SV **bot = PL_stack_base + checkmark;
1848 int gimme = GIMME_V;
1849
1850 /* make sure we put something on the stack in scalar context */
1851 if (gimme == G_SCALAR)
1852 {
1853 if (sp == bot)
1854 XPUSHs (&PL_sv_undef);
1855
1856 SP = bot + 1;
1857 }
1858
1859 PUTBACK;
1860 }
1861
1862 /* exception handling */ 2286 /* exception handling */
1863 if (expect_false (coro_throw)) 2287 if (expect_false (CORO_THROW))
1864 { 2288 {
1865 SV *exception = sv_2mortal (coro_throw); 2289 SV *exception = sv_2mortal (CORO_THROW);
1866 2290
1867 coro_throw = 0; 2291 CORO_THROW = 0;
1868 sv_setsv (ERRSV, exception); 2292 sv_setsv (ERRSV, exception);
1869 croak (0); 2293 croak (0);
2294 }
2295
2296 /* return value handling - mostly like entersub */
2297 /* make sure we put something on the stack in scalar context */
2298 if (GIMME_V == G_SCALAR)
2299 {
2300 dSP;
2301 SV **bot = PL_stack_base + checkmark;
2302
2303 if (sp == bot) /* too few, push undef */
2304 bot [1] = &PL_sv_undef;
2305 else if (sp != bot + 1) /* too many, take last one */
2306 bot [1] = *sp;
2307
2308 SP = bot + 1;
2309
2310 PUTBACK;
1870 } 2311 }
1871 2312
1872 return NORMAL; 2313 return NORMAL;
1873} 2314}
1874 2315
… …
1915 } 2356 }
1916 else 2357 else
1917 slf_argc = 0; 2358 slf_argc = 0;
1918 2359
1919 PL_op->op_ppaddr = pp_slf; 2360 PL_op->op_ppaddr = pp_slf;
1920 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2361 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1921 2362
1922 PL_op = (OP *)&slf_restore; 2363 PL_op = (OP *)&slf_restore;
2364}
2365
2366/*****************************************************************************/
2367/* dynamic wind */
2368
2369static void
2370on_enterleave_call (pTHX_ SV *cb)
2371{
2372 dSP;
2373
2374 PUSHSTACK;
2375
2376 PUSHMARK (SP);
2377 PUTBACK;
2378 call_sv (cb, G_VOID | G_DISCARD);
2379 SPAGAIN;
2380
2381 POPSTACK;
2382}
2383
2384static SV *
2385coro_avp_pop_and_free (pTHX_ AV **avp)
2386{
2387 AV *av = *avp;
2388 SV *res = av_pop (av);
2389
2390 if (AvFILLp (av) < 0)
2391 {
2392 *avp = 0;
2393 SvREFCNT_dec (av);
2394 }
2395
2396 return res;
2397}
2398
2399static void
2400coro_pop_on_enter (pTHX_ void *coro)
2401{
2402 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2403 SvREFCNT_dec (cb);
2404}
2405
2406static void
2407coro_pop_on_leave (pTHX_ void *coro)
2408{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2410 on_enterleave_call (aTHX_ sv_2mortal (cb));
1923} 2411}
1924 2412
1925/*****************************************************************************/ 2413/*****************************************************************************/
1926/* PerlIO::cede */ 2414/* PerlIO::cede */
1927 2415
… …
1996 PerlIOBuf_get_cnt, 2484 PerlIOBuf_get_cnt,
1997 PerlIOBuf_set_ptrcnt, 2485 PerlIOBuf_set_ptrcnt,
1998}; 2486};
1999 2487
2000/*****************************************************************************/ 2488/*****************************************************************************/
2489/* Coro::Semaphore & Coro::Signal */
2490
2491static SV *
2492coro_waitarray_new (pTHX_ int count)
2493{
2494 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2495 AV *av = newAV ();
2496 SV **ary;
2497
2498 /* unfortunately, building manually saves memory */
2499 Newx (ary, 2, SV *);
2500 AvALLOC (av) = ary;
2501#if PERL_VERSION_ATLEAST (5,10,0)
2502 AvARRAY (av) = ary;
2503#else
2504 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2505 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2506 SvPVX ((SV *)av) = (char *)ary;
2507#endif
2508 AvMAX (av) = 1;
2509 AvFILLp (av) = 0;
2510 ary [0] = newSViv (count);
2511
2512 return newRV_noinc ((SV *)av);
2513}
2514
2001/* Coro::Semaphore */ 2515/* semaphore */
2002 2516
2003static void 2517static void
2004coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2518coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2005{ 2519{
2006 SV *count_sv = AvARRAY (av)[0]; 2520 SV *count_sv = AvARRAY (av)[0];
… …
2018 AvARRAY (av)[0] = AvARRAY (av)[1]; 2532 AvARRAY (av)[0] = AvARRAY (av)[1];
2019 AvARRAY (av)[1] = count_sv; 2533 AvARRAY (av)[1] = count_sv;
2020 cb = av_shift (av); 2534 cb = av_shift (av);
2021 2535
2022 if (SvOBJECT (cb)) 2536 if (SvOBJECT (cb))
2537 {
2023 api_ready (aTHX_ cb); 2538 api_ready (aTHX_ cb);
2024 else 2539 --count;
2025 croak ("callbacks not yet supported"); 2540 }
2541 else if (SvTYPE (cb) == SVt_PVCV)
2542 {
2543 dSP;
2544 PUSHMARK (SP);
2545 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2546 PUTBACK;
2547 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2548 }
2026 2549
2027 SvREFCNT_dec (cb); 2550 SvREFCNT_dec (cb);
2028
2029 --count;
2030 } 2551 }
2031} 2552}
2032 2553
2033static void 2554static void
2034coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2555coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2036 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2557 /* call $sem->adjust (0) to possibly wake up some other waiters */
2037 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2038} 2559}
2039 2560
2040static int 2561static int
2041slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2042{ 2563{
2043 AV *av = (AV *)frame->data; 2564 AV *av = (AV *)frame->data;
2044 SV *count_sv = AvARRAY (av)[0]; 2565 SV *count_sv = AvARRAY (av)[0];
2045 2566
2567 /* if we are about to throw, don't actually acquire the lock, just throw */
2568 if (CORO_THROW)
2569 return 0;
2046 if (SvIVX (count_sv) > 0) 2570 else if (SvIVX (count_sv) > 0)
2047 { 2571 {
2048 SvSTATE_current->on_destroy = 0; 2572 SvSTATE_current->on_destroy = 0;
2573
2574 if (acquire)
2049 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2575 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2576 else
2577 coro_semaphore_adjust (aTHX_ av, 0);
2578
2050 return 0; 2579 return 0;
2051 } 2580 }
2052 else 2581 else
2053 { 2582 {
2054 int i; 2583 int i;
… …
2063 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2592 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2064 return 1; 2593 return 1;
2065 } 2594 }
2066} 2595}
2067 2596
2068static void 2597static int
2598slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2599{
2600 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2601}
2602
2603static int
2604slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2605{
2606 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2607}
2608
2609static void
2069slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2610slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2070{ 2611{
2071 AV *av = (AV *)SvRV (arg [0]); 2612 AV *av = (AV *)SvRV (arg [0]);
2072 2613
2073 if (SvIVX (AvARRAY (av)[0]) > 0) 2614 if (SvIVX (AvARRAY (av)[0]) > 0)
2074 { 2615 {
2075 frame->data = (void *)av; 2616 frame->data = (void *)av;
2076 frame->prepare = prepare_nop; 2617 frame->prepare = prepare_nop;
2077 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2078 } 2618 }
2079 else 2619 else
2080 { 2620 {
2081 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2621 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2082 2622
2083 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2623 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2084 frame->prepare = prepare_schedule; 2624 frame->prepare = prepare_schedule;
2085 2625
2086 /* to avoid race conditions when a woken-up coro gets terminated */ 2626 /* to avoid race conditions when a woken-up coro gets terminated */
2087 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2627 /* we arrange for a temporary on_destroy that calls adjust (0) */
2088 assert (!SvSTATE_current->on_destroy);//D
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2628 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 } 2629 }
2630}
2091 2631
2632static void
2633slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2634{
2635 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2092 frame->check = slf_check_semaphore_down; 2636 frame->check = slf_check_semaphore_down;
2093
2094} 2637}
2095 2638
2096/*****************************************************************************/ 2639static void
2097/* gensub: simple closure generation utility */ 2640slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{ 2641{
2107 CV *cv = (CV *)newSV (0); 2642 if (items >= 2)
2643 {
2644 /* callback form */
2645 AV *av = (AV *)SvRV (arg [0]);
2646 SV *cb_cv = s_get_cv_croak (arg [1]);
2108 2647
2109 sv_upgrade ((SV *)cv, SVt_PVCV); 2648 av_push (av, SvREFCNT_inc_NN (cb_cv));
2110 2649
2111 CvANON_on (cv); 2650 if (SvIVX (AvARRAY (av)[0]) > 0)
2112 CvISXSUB_on (cv); 2651 coro_semaphore_adjust (aTHX_ av, 0);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115 2652
2116 return newRV_noinc ((SV *)cv); 2653 frame->prepare = prepare_nop;
2654 frame->check = slf_check_nop;
2655 }
2656 else
2657 {
2658 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2659 frame->check = slf_check_semaphore_wait;
2660 }
2661}
2662
2663/* signal */
2664
2665static void
2666coro_signal_wake (pTHX_ AV *av, int count)
2667{
2668 SvIVX (AvARRAY (av)[0]) = 0;
2669
2670 /* now signal count waiters */
2671 while (count > 0 && AvFILLp (av) > 0)
2672 {
2673 SV *cb;
2674
2675 /* swap first two elements so we can shift a waiter */
2676 cb = AvARRAY (av)[0];
2677 AvARRAY (av)[0] = AvARRAY (av)[1];
2678 AvARRAY (av)[1] = cb;
2679
2680 cb = av_shift (av);
2681
2682 if (SvTYPE (cb) == SVt_PVCV)
2683 {
2684 dSP;
2685 PUSHMARK (SP);
2686 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2687 PUTBACK;
2688 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2689 }
2690 else
2691 {
2692 api_ready (aTHX_ cb);
2693 sv_setiv (cb, 0); /* signal waiter */
2694 }
2695
2696 SvREFCNT_dec (cb);
2697
2698 --count;
2699 }
2700}
2701
2702static int
2703slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2704{
2705 /* if we are about to throw, also stop waiting */
2706 return SvROK ((SV *)frame->data) && !CORO_THROW;
2707}
2708
2709static void
2710slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2711{
2712 AV *av = (AV *)SvRV (arg [0]);
2713
2714 if (items >= 2)
2715 {
2716 SV *cb_cv = s_get_cv_croak (arg [1]);
2717 av_push (av, SvREFCNT_inc_NN (cb_cv));
2718
2719 if (SvIVX (AvARRAY (av)[0]))
2720 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2721
2722 frame->prepare = prepare_nop;
2723 frame->check = slf_check_nop;
2724 }
2725 else if (SvIVX (AvARRAY (av)[0]))
2726 {
2727 SvIVX (AvARRAY (av)[0]) = 0;
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else
2732 {
2733 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2734
2735 av_push (av, waiter);
2736
2737 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2738 frame->prepare = prepare_schedule;
2739 frame->check = slf_check_signal_wait;
2740 }
2117} 2741}
2118 2742
2119/*****************************************************************************/ 2743/*****************************************************************************/
2120/* Coro::AIO */ 2744/* Coro::AIO */
2121 2745
… …
2132 2756
2133static void 2757static void
2134coro_aio_callback (pTHX_ CV *cv) 2758coro_aio_callback (pTHX_ CV *cv)
2135{ 2759{
2136 dXSARGS; 2760 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG; 2761 AV *state = (AV *)S_GENSUB_ARG;
2138 SV *coro = av_pop (state); 2762 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state)); 2763 SV *data_sv = newSV (sizeof (struct io_state));
2140 2764
2141 av_extend (state, items); 2765 av_extend (state, items - 1);
2142 2766
2143 sv_upgrade (data_sv, SVt_PV); 2767 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state)); 2768 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv); 2769 SvPOK_only (data_sv);
2146 2770
… …
2171static int 2795static int
2172slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2796slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2173{ 2797{
2174 AV *state = (AV *)frame->data; 2798 AV *state = (AV *)frame->data;
2175 2799
2800 /* if we are about to throw, return early */
2801 /* this does not cancel the aio request, but at least */
2802 /* it quickly returns */
2803 if (CORO_THROW)
2804 return 0;
2805
2176 /* one element that is an RV? repeat! */ 2806 /* one element that is an RV? repeat! */
2177 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2807 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2178 return 1; 2808 return 1;
2179 2809
2180 /* restore status */ 2810 /* restore status */
… …
2250 2880
2251 for (i = 0; i < items; ++i) 2881 for (i = 0; i < items; ++i)
2252 PUSHs (arg [i]); 2882 PUSHs (arg [i]);
2253 2883
2254 /* now push the callback closure */ 2884 /* now push the callback closure */
2255 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2885 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2256 2886
2257 /* now call the AIO function - we assume our request is uncancelable */ 2887 /* now call the AIO function - we assume our request is uncancelable */
2258 PUTBACK; 2888 PUTBACK;
2259 call_sv ((SV *)req, G_VOID | G_DISCARD); 2889 call_sv ((SV *)req, G_VOID | G_DISCARD);
2260 } 2890 }
… …
2274 2904
2275 XSRETURN_EMPTY; 2905 XSRETURN_EMPTY;
2276} 2906}
2277 2907
2278/*****************************************************************************/ 2908/*****************************************************************************/
2909
2910#if CORO_CLONE
2911# include "clone.c"
2912#endif
2279 2913
2280MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2281 2915
2282PROTOTYPES: DISABLE 2916PROTOTYPES: DISABLE
2283 2917
… …
2288 coro_thx = PERL_GET_CONTEXT; 2922 coro_thx = PERL_GET_CONTEXT;
2289# endif 2923# endif
2290#endif 2924#endif
2291 BOOT_PAGESIZE; 2925 BOOT_PAGESIZE;
2292 2926
2927 cctx_current = cctx_new_empty ();
2928
2293 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2294 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2295 2931
2296 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2932 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2297 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2933 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2316 2952
2317 { 2953 {
2318 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2954 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2319 2955
2320 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2956 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2321 hv_store_ent (PL_custom_op_names, slf, 2957 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2322 newSVpv ("coro_slf", 0), 0);
2323 2958
2324 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2959 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2325 hv_store_ent (PL_custom_op_descs, slf, 2960 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2326 newSVpv ("coro schedule like function", 0), 0);
2327 } 2961 }
2328 2962
2329 coroapi.ver = CORO_API_VERSION; 2963 coroapi.ver = CORO_API_VERSION;
2330 coroapi.rev = CORO_API_REVISION; 2964 coroapi.rev = CORO_API_REVISION;
2331 2965
… …
2343 2977
2344 if (!svp) croak ("Time::HiRes is required"); 2978 if (!svp) croak ("Time::HiRes is required");
2345 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2346 2980
2347 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2981 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2982
2983 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2984 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2348 } 2985 }
2349 2986
2350 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2351} 2988}
2352 2989
2353SV * 2990SV *
2354new (char *klass, ...) 2991new (char *klass, ...)
2992 ALIAS:
2993 Coro::new = 1
2355 CODE: 2994 CODE:
2356{ 2995{
2357 struct coro *coro; 2996 struct coro *coro;
2358 MAGIC *mg; 2997 MAGIC *mg;
2359 HV *hv; 2998 HV *hv;
2999 SV *cb;
2360 int i; 3000 int i;
3001
3002 if (items > 1)
3003 {
3004 cb = s_get_cv_croak (ST (1));
3005
3006 if (!ix)
3007 {
3008 if (CvISXSUB (cb))
3009 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3010
3011 if (!CvROOT (cb))
3012 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3013 }
3014 }
2361 3015
2362 Newz (0, coro, 1, struct coro); 3016 Newz (0, coro, 1, struct coro);
2363 coro->args = newAV (); 3017 coro->args = newAV ();
2364 coro->flags = CF_NEW; 3018 coro->flags = CF_NEW;
2365 3019
… …
2370 coro->hv = hv = newHV (); 3024 coro->hv = hv = newHV ();
2371 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3025 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2372 mg->mg_flags |= MGf_DUP; 3026 mg->mg_flags |= MGf_DUP;
2373 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2374 3028
3029 if (items > 1)
3030 {
2375 av_extend (coro->args, items - 1); 3031 av_extend (coro->args, items - 1 + ix - 1);
3032
3033 if (ix)
3034 {
3035 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3036 cb = (SV *)cv_coro_run;
3037 }
3038
3039 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3040
2376 for (i = 1; i < items; i++) 3041 for (i = 2; i < items; i++)
2377 av_push (coro->args, newSVsv (ST (i))); 3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
2378} 3044}
2379 OUTPUT: 3045 OUTPUT:
2380 RETVAL 3046 RETVAL
2381
2382void
2383_set_stacklevel (...)
2384 CODE:
2385 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
2386 3047
2387void 3048void
2388transfer (...) 3049transfer (...)
2389 PROTOTYPE: $$ 3050 PROTOTYPE: $$
2390 CODE: 3051 CODE:
… …
2400void 3061void
2401_exit (int code) 3062_exit (int code)
2402 PROTOTYPE: $ 3063 PROTOTYPE: $
2403 CODE: 3064 CODE:
2404 _exit (code); 3065 _exit (code);
3066
3067SV *
3068clone (Coro::State coro)
3069 CODE:
3070{
3071#if CORO_CLONE
3072 struct coro *ncoro = coro_clone (aTHX_ coro);
3073 MAGIC *mg;
3074 /* TODO: too much duplication */
3075 ncoro->hv = newHV ();
3076 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3077 mg->mg_flags |= MGf_DUP;
3078 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3079#else
3080 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3081#endif
3082}
3083 OUTPUT:
3084 RETVAL
2405 3085
2406int 3086int
2407cctx_stacksize (int new_stacksize = 0) 3087cctx_stacksize (int new_stacksize = 0)
2408 PROTOTYPE: ;$ 3088 PROTOTYPE: ;$
2409 CODE: 3089 CODE:
… …
2459 eval = 1 3139 eval = 1
2460 CODE: 3140 CODE:
2461{ 3141{
2462 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2463 { 3143 {
2464 struct coro temp; 3144 struct coro *current = SvSTATE_current;
2465 3145
2466 if (!(coro->flags & CF_RUNNING)) 3146 if (current != coro)
2467 { 3147 {
2468 PUTBACK; 3148 PUTBACK;
2469 save_perl (aTHX_ &temp); 3149 save_perl (aTHX_ current);
2470 load_perl (aTHX_ coro); 3150 load_perl (aTHX_ coro);
3151 SPAGAIN;
2471 } 3152 }
2472 3153
2473 {
2474 dSP;
2475 ENTER;
2476 SAVETMPS;
2477 PUTBACK;
2478 PUSHSTACK; 3154 PUSHSTACK;
3155
2479 PUSHMARK (SP); 3156 PUSHMARK (SP);
3157 PUTBACK;
2480 3158
2481 if (ix) 3159 if (ix)
2482 eval_sv (coderef, 0); 3160 eval_sv (coderef, 0);
2483 else 3161 else
2484 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3162 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2485 3163
2486 POPSTACK; 3164 POPSTACK;
2487 SPAGAIN; 3165 SPAGAIN;
2488 FREETMPS;
2489 LEAVE;
2490 PUTBACK;
2491 }
2492 3166
2493 if (!(coro->flags & CF_RUNNING)) 3167 if (current != coro)
2494 { 3168 {
3169 PUTBACK;
2495 save_perl (aTHX_ coro); 3170 save_perl (aTHX_ coro);
2496 load_perl (aTHX_ &temp); 3171 load_perl (aTHX_ current);
2497 SPAGAIN; 3172 SPAGAIN;
2498 } 3173 }
2499 } 3174 }
2500} 3175}
2501 3176
… …
2505 ALIAS: 3180 ALIAS:
2506 is_ready = CF_READY 3181 is_ready = CF_READY
2507 is_running = CF_RUNNING 3182 is_running = CF_RUNNING
2508 is_new = CF_NEW 3183 is_new = CF_NEW
2509 is_destroyed = CF_DESTROYED 3184 is_destroyed = CF_DESTROYED
3185 is_suspended = CF_SUSPENDED
2510 CODE: 3186 CODE:
2511 RETVAL = boolSV (coro->flags & ix); 3187 RETVAL = boolSV (coro->flags & ix);
2512 OUTPUT: 3188 OUTPUT:
2513 RETVAL 3189 RETVAL
2514 3190
… …
2516throw (Coro::State self, SV *throw = &PL_sv_undef) 3192throw (Coro::State self, SV *throw = &PL_sv_undef)
2517 PROTOTYPE: $;$ 3193 PROTOTYPE: $;$
2518 CODE: 3194 CODE:
2519{ 3195{
2520 struct coro *current = SvSTATE_current; 3196 struct coro *current = SvSTATE_current;
2521 SV **throwp = self == current ? &coro_throw : &self->throw; 3197 SV **throwp = self == current ? &CORO_THROW : &self->except;
2522 SvREFCNT_dec (*throwp); 3198 SvREFCNT_dec (*throwp);
3199 SvGETMAGIC (throw);
2523 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2524} 3201}
2525 3202
2526void 3203void
2527api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2530 3207
2531SV * 3208SV *
2532has_cctx (Coro::State coro) 3209has_cctx (Coro::State coro)
2533 PROTOTYPE: $ 3210 PROTOTYPE: $
2534 CODE: 3211 CODE:
2535 RETVAL = boolSV (!!coro->cctx); 3212 /* maybe manage the running flag differently */
3213 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2536 OUTPUT: 3214 OUTPUT:
2537 RETVAL 3215 RETVAL
2538 3216
2539int 3217int
2540is_traced (Coro::State coro) 3218is_traced (Coro::State coro)
… …
2560 3238
2561void 3239void
2562force_cctx () 3240force_cctx ()
2563 PROTOTYPE: 3241 PROTOTYPE:
2564 CODE: 3242 CODE:
2565 SvSTATE_current->cctx->idle_sp = 0; 3243 cctx_current->idle_sp = 0;
2566 3244
2567void 3245void
2568swap_defsv (Coro::State self) 3246swap_defsv (Coro::State self)
2569 PROTOTYPE: $ 3247 PROTOTYPE: $
2570 ALIAS: 3248 ALIAS:
… …
2578 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3256 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2579 3257
2580 SV *tmp = *src; *src = *dst; *dst = tmp; 3258 SV *tmp = *src; *src = *dst; *dst = tmp;
2581 } 3259 }
2582 3260
3261void
3262cancel (Coro::State self)
3263 CODE:
3264 coro_state_destroy (aTHX_ self);
3265 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3266
3267
3268SV *
3269enable_times (int enabled = enable_times)
3270 CODE:
3271{
3272 RETVAL = boolSV (enable_times);
3273
3274 if (enabled != enable_times)
3275 {
3276 enable_times = enabled;
3277
3278 coro_times_update ();
3279 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3280 }
3281}
3282 OUTPUT:
3283 RETVAL
3284
3285void
3286times (Coro::State self)
3287 PPCODE:
3288{
3289 struct coro *current = SvSTATE (coro_current);
3290
3291 if (expect_false (current == self))
3292 {
3293 coro_times_update ();
3294 coro_times_add (SvSTATE (coro_current));
3295 }
3296
3297 EXTEND (SP, 2);
3298 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3299 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3300
3301 if (expect_false (current == self))
3302 coro_times_sub (SvSTATE (coro_current));
3303}
2583 3304
2584MODULE = Coro::State PACKAGE = Coro 3305MODULE = Coro::State PACKAGE = Coro
2585 3306
2586BOOT: 3307BOOT:
2587{ 3308{
2588 int i;
2589
2590 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2591 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2592 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2593 3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2594 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2595 SvREADONLY_on (coro_current); 3314 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3315 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3316 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3317 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3318
3319 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3320 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3321 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3322 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2596 3323
2597 coro_stash = gv_stashpv ("Coro", TRUE); 3324 coro_stash = gv_stashpv ("Coro", TRUE);
2598 3325
2599 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2600 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2601 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2602 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3329 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2603 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3330 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2604 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3331 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2605
2606 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2607 coro_ready[i] = newAV ();
2608 3332
2609 { 3333 {
2610 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3334 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2611 3335
2612 coroapi.schedule = api_schedule; 3336 coroapi.schedule = api_schedule;
3337 coroapi.schedule_to = api_schedule_to;
2613 coroapi.cede = api_cede; 3338 coroapi.cede = api_cede;
2614 coroapi.cede_notself = api_cede_notself; 3339 coroapi.cede_notself = api_cede_notself;
2615 coroapi.ready = api_ready; 3340 coroapi.ready = api_ready;
2616 coroapi.is_ready = api_is_ready; 3341 coroapi.is_ready = api_is_ready;
2617 coroapi.nready = coro_nready; 3342 coroapi.nready = coro_nready;
2618 coroapi.current = coro_current; 3343 coroapi.current = coro_current;
2619 3344
2620 GCoroAPI = &coroapi; 3345 /*GCoroAPI = &coroapi;*/
2621 sv_setiv (sv, (IV)&coroapi); 3346 sv_setiv (sv, (IV)&coroapi);
2622 SvREADONLY_on (sv); 3347 SvREADONLY_on (sv);
2623 } 3348 }
2624} 3349}
3350
3351void
3352terminate (...)
3353 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2625 3355
2626void 3356void
2627schedule (...) 3357schedule (...)
2628 CODE: 3358 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3359 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3360
3361void
3362schedule_to (...)
3363 CODE:
3364 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3365
3366void
3367cede_to (...)
3368 CODE:
3369 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2630 3370
2631void 3371void
2632cede (...) 3372cede (...)
2633 CODE: 3373 CODE:
2634 CORO_EXECUTE_SLF_XS (slf_init_cede); 3374 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2648void 3388void
2649_set_readyhook (SV *hook) 3389_set_readyhook (SV *hook)
2650 PROTOTYPE: $ 3390 PROTOTYPE: $
2651 CODE: 3391 CODE:
2652 SvREFCNT_dec (coro_readyhook); 3392 SvREFCNT_dec (coro_readyhook);
3393 SvGETMAGIC (hook);
3394 if (SvOK (hook))
3395 {
2653 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3396 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 CORO_READYHOOK ();
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
2654 3405
2655int 3406int
2656prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
2657 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
2658 ALIAS: 3409 ALIAS:
… …
2664 if (items > 1) 3415 if (items > 1)
2665 { 3416 {
2666 if (ix) 3417 if (ix)
2667 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
2668 3419
2669 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2670 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2671 3422
2672 coro->prio = newprio; 3423 coro->prio = newprio;
2673 } 3424 }
2674} 3425}
2675 OUTPUT: 3426 OUTPUT:
… …
2689 CODE: 3440 CODE:
2690 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
2691 OUTPUT: 3442 OUTPUT:
2692 RETVAL 3443 RETVAL
2693 3444
2694# for async_pool speedup
2695void 3445void
2696_pool_1 (SV *cb) 3446suspend (Coro::State self)
3447 PROTOTYPE: $
2697 CODE: 3448 CODE:
2698{ 3449 self->flags |= CF_SUSPENDED;
2699 HV *hv = (HV *)SvRV (coro_current);
2700 struct coro *coro = SvSTATE_hv ((SV *)hv);
2701 AV *defav = GvAV (PL_defgv);
2702 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2703 AV *invoke_av;
2704 int i, len;
2705 3450
2706 if (!invoke) 3451void
3452resume (Coro::State self)
3453 PROTOTYPE: $
3454 CODE:
3455 self->flags &= ~CF_SUSPENDED;
3456
3457void
3458_pool_handler (...)
3459 CODE:
3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3461
3462void
3463async_pool (SV *cv, ...)
3464 PROTOTYPE: &@
3465 PPCODE:
3466{
3467 HV *hv = (HV *)av_pop (av_async_pool);
3468 AV *av = newAV ();
3469 SV *cb = ST (0);
3470 int i;
3471
3472 av_extend (av, items - 2);
3473 for (i = 1; i < items; ++i)
3474 av_push (av, SvREFCNT_inc_NN (ST (i)));
3475
3476 if ((SV *)hv == &PL_sv_undef)
2707 { 3477 {
2708 SV *old = PL_diehook; 3478 PUSHMARK (SP);
2709 PL_diehook = 0; 3479 EXTEND (SP, 2);
2710 SvREFCNT_dec (old); 3480 PUSHs (sv_Coro);
2711 croak ("\3async_pool terminate\2\n"); 3481 PUSHs ((SV *)cv_pool_handler);
3482 PUTBACK;
3483 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3484 SPAGAIN;
3485
3486 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2712 } 3487 }
2713 3488
2714 SvREFCNT_dec (coro->saved_deffh);
2715 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2716
2717 hv_store (hv, "desc", sizeof ("desc") - 1,
2718 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2719
2720 invoke_av = (AV *)SvRV (invoke);
2721 len = av_len (invoke_av);
2722
2723 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2724
2725 if (len > 0)
2726 { 3489 {
2727 av_fill (defav, len - 1); 3490 struct coro *coro = SvSTATE_hv (hv);
2728 for (i = 0; i < len; ++i) 3491
2729 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3492 assert (!coro->invoke_cb);
3493 assert (!coro->invoke_av);
3494 coro->invoke_cb = SvREFCNT_inc (cb);
3495 coro->invoke_av = av;
2730 } 3496 }
3497
3498 api_ready (aTHX_ (SV *)hv);
3499
3500 if (GIMME_V != G_VOID)
3501 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3502 else
3503 SvREFCNT_dec (hv);
2731} 3504}
3505
3506SV *
3507rouse_cb ()
3508 PROTOTYPE:
3509 CODE:
3510 RETVAL = coro_new_rouse_cb (aTHX);
3511 OUTPUT:
3512 RETVAL
2732 3513
2733void 3514void
2734_pool_2 (SV *cb) 3515rouse_wait (...)
3516 PROTOTYPE: ;$
3517 PPCODE:
3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3519
3520void
3521on_enter (SV *block)
3522 ALIAS:
3523 on_leave = 1
3524 PROTOTYPE: &
2735 CODE: 3525 CODE:
2736{ 3526{
2737 HV *hv = (HV *)SvRV (coro_current);
2738 struct coro *coro = SvSTATE_hv ((SV *)hv); 3527 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2739 3529
2740 sv_setsv (cb, &PL_sv_undef); 3530 block = s_get_cv_croak (block);
2741 3531
2742 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3532 if (!*avp)
2743 coro->saved_deffh = 0; 3533 *avp = newAV ();
2744 3534
2745 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3535 av_push (*avp, SvREFCNT_inc (block));
2746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2747 {
2748 SV *old = PL_diehook;
2749 PL_diehook = 0;
2750 SvREFCNT_dec (old);
2751 croak ("\3async_pool terminate\2\n");
2752 }
2753 3536
2754 av_clear (GvAV (PL_defgv)); 3537 if (!ix)
2755 hv_store (hv, "desc", sizeof ("desc") - 1, 3538 on_enterleave_call (aTHX_ block);
2756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2757 3539
2758 coro->prio = 0; 3540 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2759 3541 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3542 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2761 api_trace (aTHX_ coro_current, 0);
2762
2763 av_push (av_async_pool, newSVsv (coro_current));
2764} 3543}
2765 3544
2766 3545
2767MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
2768 3547
… …
2771 3550
2772 3551
2773MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
2774 3553
2775SV * 3554SV *
2776new (SV *klass, SV *count_ = 0) 3555new (SV *klass, SV *count = 0)
2777 CODE: 3556 CODE:
2778{ 3557{
2779 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3558 int semcnt = 1;
2780 AV *av = newAV ();
2781 SV **ary;
2782 3559
2783 /* unfortunately, building manually saves memory */ 3560 if (count)
2784 Newx (ary, 2, SV *); 3561 {
2785 AvALLOC (av) = ary; 3562 SvGETMAGIC (count);
2786 AvARRAY (av) = ary;
2787 AvMAX (av) = 1;
2788 AvFILLp (av) = 0;
2789 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2790 3563
2791 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3564 if (SvOK (count))
3565 semcnt = SvIV (count);
3566 }
3567
3568 RETVAL = sv_bless (
3569 coro_waitarray_new (aTHX_ semcnt),
3570 GvSTASH (CvGV (cv))
3571 );
2792} 3572}
3573 OUTPUT:
3574 RETVAL
3575
3576# helper for Coro::Channel and others
3577SV *
3578_alloc (int count)
3579 CODE:
3580 RETVAL = coro_waitarray_new (aTHX_ count);
2793 OUTPUT: 3581 OUTPUT:
2794 RETVAL 3582 RETVAL
2795 3583
2796SV * 3584SV *
2797count (SV *self) 3585count (SV *self)
… …
2806 adjust = 1 3594 adjust = 1
2807 CODE: 3595 CODE:
2808 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3596 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2809 3597
2810void 3598void
2811down (SV *self) 3599down (...)
2812 CODE: 3600 CODE:
2813 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3601 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3602
3603void
3604wait (...)
3605 CODE:
3606 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2814 3607
2815void 3608void
2816try (SV *self) 3609try (SV *self)
2817 PPCODE: 3610 PPCODE:
2818{ 3611{
… …
2830 XSRETURN_NO; 3623 XSRETURN_NO;
2831} 3624}
2832 3625
2833void 3626void
2834waiters (SV *self) 3627waiters (SV *self)
2835 CODE: 3628 PPCODE:
2836{ 3629{
2837 AV *av = (AV *)SvRV (self); 3630 AV *av = (AV *)SvRV (self);
3631 int wcount = AvFILLp (av) + 1 - 1;
2838 3632
2839 if (GIMME_V == G_SCALAR) 3633 if (GIMME_V == G_SCALAR)
2840 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3634 XPUSHs (sv_2mortal (newSViv (wcount)));
2841 else 3635 else
2842 { 3636 {
2843 int i; 3637 int i;
2844 EXTEND (SP, AvFILLp (av) + 1 - 1); 3638 EXTEND (SP, wcount);
2845 for (i = 1; i <= AvFILLp (av); ++i) 3639 for (i = 1; i <= wcount; ++i)
2846 PUSHs (newSVsv (AvARRAY (av)[i])); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2847 } 3641 }
2848} 3642}
3643
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645
3646void
3647_may_delete (SV *sem, int count, int extra_refs)
3648 PPCODE:
3649{
3650 AV *av = (AV *)SvRV (sem);
3651
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES;
3656
3657 XSRETURN_NO;
3658}
3659
3660MODULE = Coro::State PACKAGE = Coro::Signal
3661
3662SV *
3663new (SV *klass)
3664 CODE:
3665 RETVAL = sv_bless (
3666 coro_waitarray_new (aTHX_ 0),
3667 GvSTASH (CvGV (cv))
3668 );
3669 OUTPUT:
3670 RETVAL
3671
3672void
3673wait (...)
3674 CODE:
3675 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3676
3677void
3678broadcast (SV *self)
3679 CODE:
3680{
3681 AV *av = (AV *)SvRV (self);
3682 coro_signal_wake (aTHX_ av, AvFILLp (av));
3683}
3684
3685void
3686send (SV *self)
3687 CODE:
3688{
3689 AV *av = (AV *)SvRV (self);
3690
3691 if (AvFILLp (av))
3692 coro_signal_wake (aTHX_ av, 1);
3693 else
3694 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3695}
3696
3697IV
3698awaited (SV *self)
3699 CODE:
3700 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3701 OUTPUT:
3702 RETVAL
2849 3703
2850 3704
2851MODULE = Coro::State PACKAGE = Coro::AnyEvent 3705MODULE = Coro::State PACKAGE = Coro::AnyEvent
2852 3706
2853BOOT: 3707BOOT:
… …
2868 sv_setsv (sv_activity, &PL_sv_undef); 3722 sv_setsv (sv_activity, &PL_sv_undef);
2869 if (coro_nready >= incede) 3723 if (coro_nready >= incede)
2870 { 3724 {
2871 PUSHMARK (SP); 3725 PUSHMARK (SP);
2872 PUTBACK; 3726 PUTBACK;
2873 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 3727 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2874 SPAGAIN;
2875 } 3728 }
2876 3729
2877 --incede; 3730 --incede;
2878} 3731}
2879 3732
… …
2882 3735
2883void 3736void
2884_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
2885 CODE: 3738 CODE:
2886{ 3739{
2887 HV *st; 3740 SV *req_cv = s_get_cv_croak (req);
2888 GV *gvp;
2889 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2890 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
2891 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2892 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
2893 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3744 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2894} 3745}
2895 3746
3747MODULE = Coro::State PACKAGE = Coro::Select
3748
3749void
3750patch_pp_sselect ()
3751 CODE:
3752 if (!coro_old_pp_sselect)
3753 {
3754 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3755 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3756 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3757 }
3758
3759void
3760unpatch_pp_sselect ()
3761 CODE:
3762 if (coro_old_pp_sselect)
3763 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0;
3766 }
3767
3768

Diff Legend

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