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.296 by root, Tue Nov 18 10:39:52 2008 UTC vs.
Revision 1.366 by root, Tue Jul 21 03:39:58 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
111#endif 58#endif
112 59
113#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
127#else 74#else
128# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
130#endif 77#endif
131 78
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
133 80
134#if __GNUC__ >= 3 81#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 84# define INLINE static inline
138#else 85#else
139# define attribute(x) 86# define attribute(x)
140# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
141# define INLINE static 88# define INLINE static
… …
145#define expect_true(expr) expect ((expr) != 0, 1) 92#define expect_true(expr) expect ((expr) != 0, 1)
146 93
147#define NOINLINE attribute ((noinline)) 94#define NOINLINE attribute ((noinline))
148 95
149#include "CoroAPI.h" 96#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */
150 98
151#ifdef USE_ITHREADS 99#ifdef USE_ITHREADS
152# if CORO_PTHREAD 100# if CORO_PTHREAD
153static void *coro_thx; 101static void *coro_thx;
154# endif 102# endif
155#endif 103#endif
156 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
157static 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]);
158 117
159/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
160#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
161static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
162 121
… …
166static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
167static JMPENV *main_top_env; 126static JMPENV *main_top_env;
168static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
169static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
170 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
171static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
172static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
173static SV *rv_diehook; 136static SV *rv_diehook;
174static SV *rv_warnhook; 137static SV *rv_warnhook;
175static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
176 139
177/* async_pool helper stuff */ 140/* async_pool helper stuff */
178static SV *sv_pool_rss; 141static SV *sv_pool_rss;
179static SV *sv_pool_size; 142static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */
180static 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;
181 148
182/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
183static 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;
184 157
185static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
186static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
187 160
188enum { 161enum {
… …
214 int valgrind_id; 187 int valgrind_id;
215#endif 188#endif
216 unsigned char flags; 189 unsigned char flags;
217} coro_cctx; 190} coro_cctx;
218 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
219enum { 196enum {
220 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
221 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
222 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
223 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 */
224}; 202};
225 203
226/* 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 */
227typedef struct 205typedef struct
228{ 206{
229 SV *defsv; 207 SV *defsv;
230 AV *defav; 208 AV *defav;
231 SV *errsv; 209 SV *errsv;
232 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
233#define VAR(name,type) type name; 212#define VAR(name,type) type name;
234# include "state.h" 213# include "state.h"
235#undef VAR 214#undef VAR
236} perl_slots; 215} perl_slots;
237 216
… …
240/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
241struct coro { 220struct coro {
242 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
243 coro_cctx *cctx; 222 coro_cctx *cctx;
244 223
224 /* ready queue */
225 struct coro *next_ready;
226
245 /* state data */ 227 /* state data */
246 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
247 AV *mainstack; 229 AV *mainstack;
248 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
249 231
232 CV *startcv; /* the CV to execute */
250 AV *args; /* data associated with this coroutine (initial args) */ 233 AV *args; /* data associated with this coroutine (initial args) */
251 int refcnt; /* coroutines are refcounted, yes */ 234 int refcnt; /* coroutines are refcounted, yes */
252 int flags; /* CF_ flags */ 235 int flags; /* CF_ flags */
253 HV *hv; /* the perl hash associated with this coro, if any */ 236 HV *hv; /* the perl hash associated with this coro, if any */
254 void (*on_destroy)(pTHX_ struct coro *coro); 237 void (*on_destroy)(pTHX_ struct coro *coro);
255 238
256 /* statistics */ 239 /* statistics */
257 int usecount; /* number of transfers to this coro */ 240 int usecount; /* number of transfers to this coro */
258 241
259 /* coro process data */ 242 /* coro process data */
260 int prio; 243 int prio;
261 SV *throw; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
245 SV *rouse_cb;
262 246
263 /* async_pool */ 247 /* async_pool */
264 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;
265 258
266 /* linked list */ 259 /* linked list */
267 struct coro *next, *prev; 260 struct coro *next, *prev;
268}; 261};
269 262
… …
272 265
273/* the following variables are effectively part of the perl context */ 266/* the following variables are effectively part of the perl context */
274/* and get copied between struct coro and these variables */ 267/* and get copied between struct coro and these variables */
275/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
276static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
277static SV *coro_throw;
278 270
279/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
280 272
281#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
282#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
283#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
284#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
285#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
286#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
287 279
288/* for Coro.pm */ 280/* for Coro.pm */
289static SV *coro_current; 281static SV *coro_current;
290static SV *coro_readyhook; 282static SV *coro_readyhook;
291static 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;
292static struct coro *coro_first; 285static struct coro *coro_first;
293#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}
294 307
295/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
296 309
297static SV * 310static SV *
298coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
322 get_hv (name, create); 335 get_hv (name, create);
323#endif 336#endif
324 return get_hv (name, create); 337 return get_hv (name, create);
325} 338}
326 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
327static AV * 439static AV *
328coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
329{ 441{
330 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
332 444
333 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 451#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 453 --AvFILLp (padlist);
342 454
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
345 457
346 return newpadlist; 458 return newpadlist;
347} 459}
348 460
349static void 461static void
350free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
351{ 463{
352 /* may be during global destruction */ 464 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
354 { 466 {
355 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
356 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
357 { 470 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
359 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 473 I32 j = AvFILLp (av);
361 SV *sv; 474
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 480 }
368 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
370 } 486 }
371} 487}
372 488
373static int 489static int
374coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
375{ 491{
376 AV *padlist; 492 AV *padlist;
377 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;
378 498
379 /* casting is fun. */ 499 /* casting is fun. */
380 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
381 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
382 502
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 504
385 return 0; 505 return 0;
386} 506}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 507
391static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 509 0, 0, 0, 0,
393 coro_cv_free 510 coro_cv_free
394}; 511};
395
396#define CORO_MAGIC_NN(sv, type) \
397 (expect_true (SvMAGIC (sv)->mg_type == type) \
398 ? SvMAGIC (sv) \
399 : mg_find (sv, type))
400
401#define CORO_MAGIC(sv, type) \
402 (expect_true (SvMAGIC (sv)) \
403 ? CORO_MAGIC_NN (sv, type) \
404 : 0)
405
406#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
407#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
408
409INLINE struct coro *
410SvSTATE_ (pTHX_ SV *coro)
411{
412 HV *stash;
413 MAGIC *mg;
414
415 if (SvROK (coro))
416 coro = SvRV (coro);
417
418 if (expect_false (SvTYPE (coro) != SVt_PVHV))
419 croak ("Coro::State object required");
420
421 stash = SvSTASH (coro);
422 if (expect_false (stash != coro_stash && stash != coro_state_stash))
423 {
424 /* very slow, but rare, check */
425 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
426 croak ("Coro::State object required");
427 }
428
429 mg = CORO_MAGIC_state (coro);
430 return (struct coro *)mg->mg_ptr;
431}
432
433#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
434
435/* faster than SvSTATE, but expects a coroutine hv */
436#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
437#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
438 512
439/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
440static void 514static void
441get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
442{ 516{
… …
448 else 522 else
449 { 523 {
450#if CORO_PREFER_PERL_FUNCTIONS 524#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 525 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 526 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
457#else 531#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 533#endif
460 } 534 }
461} 535}
462 536
463static void 537static void
… …
470 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);
471 545
472 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
473 547
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
476 550
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 552}
479 553
480/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
481 558
482static void 559static void
483load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
484{ 561{
485 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
486 c->slot = 0; 563 c->slot = 0;
487 564
488 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
489 566
490 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
494 572
495 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 574 # include "state.h"
497 #undef VAR 575 #undef VAR
498 576
… …
511 589
512 PUTBACK; 590 PUTBACK;
513 } 591 }
514 592
515 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
516 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 }
517} 611}
518 612
519static void 613static void
520save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
521{ 615{
522 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;
523 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
524 634
525 { 635 {
526 dSP; 636 dSP;
527 I32 cxix = cxstack_ix; 637 I32 cxix = cxstack_ix;
… …
539 { 649 {
540 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
541 { 651 {
542 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
543 653
544 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))
545 { 655 {
546 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
547 657
548 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
549 { 659 {
… …
573 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
574 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
575 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
576 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
577 { 687 {
578 int i; 688 unsigned int i;
579 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
580 CXINC; 690 CXINC;
581 } 691 }
582 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
583 693
584 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
585 695
586 { 696 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 698
589 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
593 704
594 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 706 # include "state.h"
596 #undef VAR 707 #undef VAR
597 } 708 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 713 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 714 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 715 * not usually need a lot of stackspace.
605 */ 716 */
606#if CORO_PREFER_PERL_FUNCTIONS 717#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 718# define coro_init_stacks(thx) init_stacks ()
608#else 719#else
609static void 720static void
610coro_init_stacks (pTHX) 721coro_init_stacks (pTHX)
611{ 722{
612 PL_curstackinfo = new_stackinfo(32, 8); 723 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 786#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 787 Safefree (PL_retstack);
677#endif 788#endif
678} 789}
679 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
680static size_t 800static size_t
681coro_rss (pTHX_ struct coro *coro) 801coro_rss (pTHX_ struct coro *coro)
682{ 802{
683 size_t rss = sizeof (*coro); 803 size_t rss = sizeof (*coro);
684 804
685 if (coro->mainstack) 805 if (coro->mainstack)
686 { 806 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 807 if (coro->flags & CF_RUNNING)
691 { 808 {
692 slot = &tmp_slot; 809 #define SYM(sym) PL_ ## sym
693 810 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 811 #undef SYM
697 } 812 }
698 else 813 else
699 slot = coro->slot;
700
701 if (slot)
702 { 814 {
703 rss += sizeof (slot->curstackinfo); 815 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 816 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 817 #undef SYM
706 rss += slot->tmps_max * sizeof (SV *);
707 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
708 rss += slot->scopestack_max * sizeof (I32);
709 rss += slot->savestack_max * sizeof (ANY);
710
711#if !PERL_VERSION_ATLEAST (5,10,0)
712 rss += slot->retstack_max * sizeof (OP *);
713#endif
714 } 818 }
715 } 819 }
716 820
717 return rss; 821 return rss;
718} 822}
… …
731#endif 835#endif
732 836
733/* 837/*
734 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
735 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
736 * and instead of tryign to save and restore the hash elements, we just provide 840 * and instead of trying to save and restore the hash elements, we just provide
737 * readback here. 841 * readback here.
738 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
739 * not expecting this to actually change the hook. This is a potential problem
740 * when a schedule happens then, but we ignore this.
741 */ 842 */
742static int 843static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 845{
745 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 900
800 if (svp) 901 if (svp)
801 { 902 {
802 SV *old = *svp; 903 SV *old = *svp;
803 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
805 return 0; 906 return 0;
806 } 907 }
807 } 908 }
808 909
… …
818 919
819static int 920static int
820slf_check_nop (pTHX_ struct CoroSLF *frame) 921slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 922{
822 return 0; 923 return 0;
924}
925
926static int
927slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{
929 return 1;
823} 930}
824 931
825static UNOP coro_setup_op; 932static UNOP coro_setup_op;
826 933
827static 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 */
… …
834 941
835 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 949 PL_curpm = 0;
840 PL_curpad = 0; 950 PL_curpad = 0;
841 PL_localizing = 0; 951 PL_localizing = 0;
842 PL_dirty = 0; 952 PL_dirty = 0;
843 PL_restartop = 0; 953 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 955 PL_parser = 0;
846#endif 956#endif
957 PL_hints = 0;
847 958
848 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
849 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 );
850 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);
851 962
852 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
855 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;
856 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 970
859 { 971 {
860 dSP; 972 dSP;
861 UNOP myop; 973 UNOP myop;
862 974
863 Zero (&myop, 1, UNOP); 975 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 976 myop.op_next = Nullop;
977 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 978 myop.op_flags = OPf_WANT_VOID;
866 979
867 PUSHMARK (SP); 980 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 981 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 982 PUTBACK;
870 PL_op = (OP *)&myop; 983 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 984 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 985 }
874 986
875 /* 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
876 * 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.
877 */ 989 */
878 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 */
879 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 */
880 992
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
882 coro_setup_op.op_next = PL_op; 994 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 995 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 996 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 997 /* no flags etc. required, as an init function won't be called */
886 998
887 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
888 1000
889 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
890 coro_throw = coro->throw; 1002 CORO_THROW = coro->except;
891}
892 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
893static void 1011static void
894coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
895{ 1013{
896 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
897 { 1015 {
898 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
908 1026
909 /* unwind main stack */ 1027 /* unwind main stack */
910 dounwind (-1); 1028 dounwind (-1);
911 } 1029 }
1030}
912 1031
913 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
914 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
915 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
916 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
917 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv));
919 1036
920 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook);
922 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
923 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (coro_throw); 1070 SvREFCNT_dec (coro->rouse_cb);
925 1071 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1072 SvREFCNT_dec (coro->invoke_av);
1073 }
927} 1074}
928 1075
929INLINE void 1076INLINE void
930free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
931{ 1078{
… …
939static int 1086static int
940runops_trace (pTHX) 1087runops_trace (pTHX)
941{ 1088{
942 COP *oldcop = 0; 1089 COP *oldcop = 0;
943 int oldcxix = -2; 1090 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1091
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1093 {
949 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
950 1095
951 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1097 {
953 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)
954 { 1099 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1101 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
958 SV **cb; 1103 SV **cb;
… …
995 1140
996 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
997 { 1142 {
998 SV **cb; 1143 SV **cb;
999 1144
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1146 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1148
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1150 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1151 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
1010 1154
1011 if (isGV (gv)) 1155 if (isGV (gv))
… …
1016 SAVETMPS; 1160 SAVETMPS;
1017 EXTEND (SP, 3); 1161 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1162 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1163 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1164 PUSHs (fullname);
1021 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);
1022 PUTBACK; 1166 PUTBACK;
1023 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);
1024 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);
1025 SPAGAIN; 1169 SPAGAIN;
1026 FREETMPS; 1170 FREETMPS;
… …
1029 } 1173 }
1030 1174
1031 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1032 } 1176 }
1033 1177
1034 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1179 {
1036 dSP; 1180 dSP;
1037 1181
1038 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1183 ENTER;
… …
1058 1202
1059 TAINT_NOT; 1203 TAINT_NOT;
1060 return 0; 1204 return 0;
1061} 1205}
1062 1206
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1207static struct CoroSLF cctx_ssl_frame;
1065 1208
1066static void 1209static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1211{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1212 ta->prev = 0;
1071} 1213}
1072 1214
1073static int 1215static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1217{
… …
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1221}
1080 1222
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1224static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1084{ 1226{
1085 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1086 1228
1087 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1089 1231
1090 /* we already must be executing an SLF op, there is no other valid way 1232 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1233 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1234 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1236
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1237 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1096 cctx_ssl_cctx = cctx;
1097 cctx_ssl_frame = slf_frame; 1238 cctx_ssl_frame = slf_frame;
1098 1239
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1241 slf_frame.check = slf_check_set_stacklevel;
1101} 1242}
… …
1124 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1125 /* 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 */
1126 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1127 1268
1128 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1130 1271
1131 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1133 1274
1134 /* 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 */
1135 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1136 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 */
1137 1282
1138 /* 1283 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1140 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1141 * reason for perl_run to return. We try to exit by jumping to the 1286 * reason for perl_run to return. We try to exit by jumping to the
1142 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1291 */
1145 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1294 }
1148} 1295}
… …
1225cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1226{ 1373{
1227 if (!cctx) 1374 if (!cctx)
1228 return; 1375 return;
1229 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1230 --cctx_count; 1379 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1232 1381
1233 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1298 1447
1299 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1300 { 1449 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1302 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1303 1452
1304 if (expect_false (next->flags & CF_RUNNING))
1305 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1306
1307 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1308 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1309 1455
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1312 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1313#endif 1459#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1466{
1321 dSTACKLEVEL; 1467 dSTACKLEVEL;
1322 1468
1323 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1470 if (expect_false (!prev))
1325 { 1471 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1472 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1474 }
1329 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1330 { 1476 {
1331 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1332 1478
1333 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1334 { 1480 {
1335 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1339 } 1484 }
1340 1485
1341 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1353 } 1498 }
1354 else 1499 else
1355 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1356 1501
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1503 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1506 && !force_cctx
1364 )) 1507 ))
1365 { 1508 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1367 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1511
1369 prev->cctx = 0;
1370
1371 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1372 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1513 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1376 1517
1377 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1378 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1379 1522
1380 ++next->usecount; 1523 ++next->usecount;
1381 1524
1382 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1527
1385 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1386 { 1531 {
1387 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1535 }
1391 1536
1392 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1393 } 1538 }
1394} 1539}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1548{
1404 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1405 return 0; 1550 return 0;
1406 1551
1407 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1409 1554
1410 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1411 1556
1412 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1561 --coro_nready;
1417 } 1562 }
1418 else 1563 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1565
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1422 { 1567 && coro->mainstack != main_mainstack
1423 struct coro temp; 1568 && coro->slot
1424 1569 && !PL_dirty)
1425 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1426
1427 save_perl (aTHX_ &temp);
1428 load_perl (aTHX_ coro);
1429
1430 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436 1571
1437 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1575 SvREFCNT_dec (CORO_THROW);
1439 1576
1440 if (coro->next) coro->next->prev = coro->prev; 1577 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1578 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1579 if (coro == coro_first) coro_first = coro->next;
1443 1580
… …
1502/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1503 1640
1504INLINE void 1641INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1506{ 1643{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1508}
1509 1645
1510INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1511coro_deq (pTHX) 1654coro_deq (pTHX)
1512{ 1655{
1513 int prio; 1656 int prio;
1514 1657
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1517 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1518 1669
1519 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1520} 1688}
1521 1689
1522static int 1690static int
1523api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1524{ 1692{
1525 struct coro *coro;
1526 SV *sv_hook;
1527 void (*xs_hook)(void);
1528
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1533 1694
1534 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1535 return 0; 1696 return 0;
1536 1697
1537 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1538 1699
1539 sv_hook = coro_nready ? 0 : coro_readyhook;
1540 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1541
1542 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1543 ++coro_nready;
1544 1701
1545 if (sv_hook) 1702 if (!coro_nready++)
1546 { 1703 if (coroapi.readyhook)
1547 dSP; 1704 coroapi.readyhook ();
1548
1549 ENTER;
1550 SAVETMPS;
1551
1552 PUSHMARK (SP);
1553 PUTBACK;
1554 call_sv (sv_hook, G_VOID | G_DISCARD);
1555
1556 FREETMPS;
1557 LEAVE;
1558 }
1559
1560 if (xs_hook)
1561 xs_hook ();
1562 1705
1563 return 1; 1706 return 1;
1564} 1707}
1565 1708
1566static int 1709static int
1567api_is_ready (pTHX_ SV *coro_sv) 1710api_is_ready (pTHX_ SV *coro_sv)
1568{ 1711{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1712 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1713}
1571 1714
1715/* expects to own a reference to next->hv */
1572INLINE void 1716INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1718{
1575 SV *prev_sv, *next_sv;
1576
1577 for (;;)
1578 {
1579 next_sv = coro_deq (aTHX);
1580
1581 /* nothing to schedule: call the idle handler */
1582 if (expect_false (!next_sv))
1583 {
1584 dSP;
1585
1586 ENTER;
1587 SAVETMPS;
1588
1589 PUSHMARK (SP);
1590 PUTBACK;
1591 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1592
1593 FREETMPS;
1594 LEAVE;
1595 continue;
1596 }
1597
1598 ta->next = SvSTATE_hv (next_sv);
1599
1600 /* cannot transfer to destroyed coros, skip and look for next */
1601 if (expect_false (ta->next->flags & CF_DESTROYED))
1602 {
1603 SvREFCNT_dec (next_sv);
1604 /* coro_nready has already been taken care of by destroy */
1605 continue;
1606 }
1607
1608 --coro_nready;
1609 break;
1610 }
1611
1612 /* free this only after the transfer */
1613 prev_sv = SvRV (coro_current); 1719 SV *prev_sv = SvRV (coro_current);
1720
1614 ta->prev = SvSTATE_hv (prev_sv); 1721 ta->prev = SvSTATE_hv (prev_sv);
1722 ta->next = next;
1723
1615 TRANSFER_CHECK (*ta); 1724 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1725
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1726 SvRV_set (coro_current, (SV *)next->hv);
1619 1727
1620 free_coro_mortal (aTHX); 1728 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1729 coro_mortal = prev_sv;
1622} 1730}
1623 1731
1732static void
1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1734{
1735 for (;;)
1736 {
1737 struct coro *next = coro_deq (aTHX);
1738
1739 if (expect_true (next))
1740 {
1741 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else
1745 {
1746 next->flags &= ~CF_READY;
1747 --coro_nready;
1748
1749 prepare_schedule_to (aTHX_ ta, next);
1750 break;
1751 }
1752 }
1753 else
1754 {
1755 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle)))
1758 {
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready;
1762 }
1763 else
1764 {
1765 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
1624INLINE void 1781INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1782prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1783{
1627 api_ready (aTHX_ coro_current); 1784 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1785 prepare_schedule (aTHX_ ta);
… …
1647{ 1804{
1648 struct coro_transfer_args ta; 1805 struct coro_transfer_args ta;
1649 1806
1650 prepare_schedule (aTHX_ &ta); 1807 prepare_schedule (aTHX_ &ta);
1651 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);
1652} 1819}
1653 1820
1654static int 1821static int
1655api_cede (pTHX) 1822api_cede (pTHX)
1656{ 1823{
… …
1685static void 1852static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1853api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1854{
1688 struct coro *coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1689 1856
1857 if (coro->flags & CF_RUNNING)
1858 croak ("cannot enable tracing on a running coroutine, caught");
1859
1690 if (flags & CC_TRACE) 1860 if (flags & CC_TRACE)
1691 { 1861 {
1692 if (!coro->cctx) 1862 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1863 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1864 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1865 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1866
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1867 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1868 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1869 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1870 {
… …
1703 if (coro->flags & CF_RUNNING) 1873 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1874 PL_runops = RUNOPS_DEFAULT;
1705 else 1875 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1876 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 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;
1708} 2122}
1709 2123
1710/*****************************************************************************/ 2124/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2125/* schedule-like-function opcode (SLF) */
1712 2126
… …
1759static void 2173static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2174slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2175{
1762 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2177 frame->check = slf_check_nop;
2178}
2179
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);
1764} 2206}
1765 2207
1766static void 2208static void
1767slf_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)
1768{ 2210{
… …
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 /* exception handling */ 2286 /* exception handling */
1845 if (expect_false (coro_throw)) 2287 if (expect_false (CORO_THROW))
1846 { 2288 {
1847 SV *exception = sv_2mortal (coro_throw); 2289 SV *exception = sv_2mortal (CORO_THROW);
1848 2290
1849 coro_throw = 0; 2291 CORO_THROW = 0;
1850 sv_setsv (ERRSV, exception); 2292 sv_setsv (ERRSV, exception);
1851 croak (0); 2293 croak (0);
1852 } 2294 }
1853 2295
1854 /* return value handling - mostly like entersub */ 2296 /* return value handling - mostly like entersub */
… …
1914 } 2356 }
1915 else 2357 else
1916 slf_argc = 0; 2358 slf_argc = 0;
1917 2359
1918 PL_op->op_ppaddr = pp_slf; 2360 PL_op->op_ppaddr = pp_slf;
1919 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 */
1920 2362
1921 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));
1922} 2411}
1923 2412
1924/*****************************************************************************/ 2413/*****************************************************************************/
1925/* PerlIO::cede */ 2414/* PerlIO::cede */
1926 2415
… …
1995 PerlIOBuf_get_cnt, 2484 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2485 PerlIOBuf_set_ptrcnt,
1997}; 2486};
1998 2487
1999/*****************************************************************************/ 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
2000/* Coro::Semaphore */ 2515/* semaphore */
2001 2516
2002static void 2517static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2518coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{ 2519{
2005 SV *count_sv = AvARRAY (av)[0]; 2520 SV *count_sv = AvARRAY (av)[0];
… …
2017 AvARRAY (av)[0] = AvARRAY (av)[1]; 2532 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv; 2533 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av); 2534 cb = av_shift (av);
2020 2535
2021 if (SvOBJECT (cb)) 2536 if (SvOBJECT (cb))
2537 {
2022 api_ready (aTHX_ cb); 2538 api_ready (aTHX_ cb);
2023 else 2539 --count;
2024 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 }
2025 2549
2026 SvREFCNT_dec (cb); 2550 SvREFCNT_dec (cb);
2027
2028 --count;
2029 } 2551 }
2030} 2552}
2031 2553
2032static void 2554static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2555coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2035 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2557 /* call $sem->adjust (0) to possibly wake up some other waiters */
2036 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2558 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2037} 2559}
2038 2560
2039static int 2561static int
2040slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2562slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2041{ 2563{
2042 AV *av = (AV *)frame->data; 2564 AV *av = (AV *)frame->data;
2043 SV *count_sv = AvARRAY (av)[0]; 2565 SV *count_sv = AvARRAY (av)[0];
2044 2566
2045 /* if we are about to throw, don't actually acquire the lock, just throw */ 2567 /* if we are about to throw, don't actually acquire the lock, just throw */
2046 if (coro_throw) 2568 if (CORO_THROW)
2047 return 0; 2569 return 0;
2048 else if (SvIVX (count_sv) > 0) 2570 else if (SvIVX (count_sv) > 0)
2049 { 2571 {
2050 SvSTATE_current->on_destroy = 0; 2572 SvSTATE_current->on_destroy = 0;
2573
2574 if (acquire)
2051 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
2052 return 0; 2579 return 0;
2053 } 2580 }
2054 else 2581 else
2055 { 2582 {
2056 int i; 2583 int i;
… …
2065 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2592 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2066 return 1; 2593 return 1;
2067 } 2594 }
2068} 2595}
2069 2596
2070static 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
2071slf_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)
2072{ 2611{
2073 AV *av = (AV *)SvRV (arg [0]); 2612 AV *av = (AV *)SvRV (arg [0]);
2074 2613
2075 if (SvIVX (AvARRAY (av)[0]) > 0) 2614 if (SvIVX (AvARRAY (av)[0]) > 0)
2076 { 2615 {
… …
2086 2625
2087 /* to avoid race conditions when a woken-up coro gets terminated */ 2626 /* to avoid race conditions when a woken-up coro gets terminated */
2088 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2627 /* we arrange for a temporary on_destroy that calls adjust (0) */
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
… …
2174 AV *state = (AV *)frame->data; 2798 AV *state = (AV *)frame->data;
2175 2799
2176 /* if we are about to throw, return early */ 2800 /* if we are about to throw, return early */
2177 /* this does not cancel the aio request, but at least */ 2801 /* this does not cancel the aio request, but at least */
2178 /* it quickly returns */ 2802 /* it quickly returns */
2179 if (coro_throw) 2803 if (CORO_THROW)
2180 return 0; 2804 return 0;
2181 2805
2182 /* one element that is an RV? repeat! */ 2806 /* one element that is an RV? repeat! */
2183 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2807 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2184 return 1; 2808 return 1;
… …
2256 2880
2257 for (i = 0; i < items; ++i) 2881 for (i = 0; i < items; ++i)
2258 PUSHs (arg [i]); 2882 PUSHs (arg [i]);
2259 2883
2260 /* now push the callback closure */ 2884 /* now push the callback closure */
2261 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))));
2262 2886
2263 /* now call the AIO function - we assume our request is uncancelable */ 2887 /* now call the AIO function - we assume our request is uncancelable */
2264 PUTBACK; 2888 PUTBACK;
2265 call_sv ((SV *)req, G_VOID | G_DISCARD); 2889 call_sv ((SV *)req, G_VOID | G_DISCARD);
2266 } 2890 }
… …
2280 2904
2281 XSRETURN_EMPTY; 2905 XSRETURN_EMPTY;
2282} 2906}
2283 2907
2284/*****************************************************************************/ 2908/*****************************************************************************/
2909
2910#if CORO_CLONE
2911# include "clone.c"
2912#endif
2285 2913
2286MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2914MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2287 2915
2288PROTOTYPES: DISABLE 2916PROTOTYPES: DISABLE
2289 2917
… …
2294 coro_thx = PERL_GET_CONTEXT; 2922 coro_thx = PERL_GET_CONTEXT;
2295# endif 2923# endif
2296#endif 2924#endif
2297 BOOT_PAGESIZE; 2925 BOOT_PAGESIZE;
2298 2926
2927 cctx_current = cctx_new_empty ();
2928
2299 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2929 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2300 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2930 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2301 2931
2302 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;
2303 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;
… …
2322 2952
2323 { 2953 {
2324 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2954 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2325 2955
2326 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2956 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2327 hv_store_ent (PL_custom_op_names, slf, 2957 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2328 newSVpv ("coro_slf", 0), 0);
2329 2958
2330 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2959 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2331 hv_store_ent (PL_custom_op_descs, slf, 2960 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2332 newSVpv ("coro schedule like function", 0), 0);
2333 } 2961 }
2334 2962
2335 coroapi.ver = CORO_API_VERSION; 2963 coroapi.ver = CORO_API_VERSION;
2336 coroapi.rev = CORO_API_REVISION; 2964 coroapi.rev = CORO_API_REVISION;
2337 2965
… …
2349 2977
2350 if (!svp) croak ("Time::HiRes is required"); 2978 if (!svp) croak ("Time::HiRes is required");
2351 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2979 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2352 2980
2353 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));
2354 } 2985 }
2355 2986
2356 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2987 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2357} 2988}
2358 2989
2359SV * 2990SV *
2360new (char *klass, ...) 2991new (char *klass, ...)
2992 ALIAS:
2993 Coro::new = 1
2361 CODE: 2994 CODE:
2362{ 2995{
2363 struct coro *coro; 2996 struct coro *coro;
2364 MAGIC *mg; 2997 MAGIC *mg;
2365 HV *hv; 2998 HV *hv;
2999 SV *cb;
2366 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 }
2367 3015
2368 Newz (0, coro, 1, struct coro); 3016 Newz (0, coro, 1, struct coro);
2369 coro->args = newAV (); 3017 coro->args = newAV ();
2370 coro->flags = CF_NEW; 3018 coro->flags = CF_NEW;
2371 3019
… …
2376 coro->hv = hv = newHV (); 3024 coro->hv = hv = newHV ();
2377 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);
2378 mg->mg_flags |= MGf_DUP; 3026 mg->mg_flags |= MGf_DUP;
2379 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3027 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2380 3028
3029 if (items > 1)
3030 {
2381 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
2382 for (i = 1; i < items; i++) 3041 for (i = 2; i < items; i++)
2383 av_push (coro->args, newSVsv (ST (i))); 3042 av_push (coro->args, newSVsv (ST (i)));
3043 }
2384} 3044}
2385 OUTPUT: 3045 OUTPUT:
2386 RETVAL 3046 RETVAL
2387 3047
2388void 3048void
… …
2401void 3061void
2402_exit (int code) 3062_exit (int code)
2403 PROTOTYPE: $ 3063 PROTOTYPE: $
2404 CODE: 3064 CODE:
2405 _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
2406 3085
2407int 3086int
2408cctx_stacksize (int new_stacksize = 0) 3087cctx_stacksize (int new_stacksize = 0)
2409 PROTOTYPE: ;$ 3088 PROTOTYPE: ;$
2410 CODE: 3089 CODE:
… …
2460 eval = 1 3139 eval = 1
2461 CODE: 3140 CODE:
2462{ 3141{
2463 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3142 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2464 { 3143 {
2465 struct coro temp; 3144 struct coro *current = SvSTATE_current;
2466 3145
2467 if (!(coro->flags & CF_RUNNING)) 3146 if (current != coro)
2468 { 3147 {
2469 PUTBACK; 3148 PUTBACK;
2470 save_perl (aTHX_ &temp); 3149 save_perl (aTHX_ current);
2471 load_perl (aTHX_ coro); 3150 load_perl (aTHX_ coro);
3151 SPAGAIN;
2472 } 3152 }
2473 3153
2474 {
2475 dSP;
2476 ENTER;
2477 SAVETMPS;
2478 PUTBACK;
2479 PUSHSTACK; 3154 PUSHSTACK;
3155
2480 PUSHMARK (SP); 3156 PUSHMARK (SP);
3157 PUTBACK;
2481 3158
2482 if (ix) 3159 if (ix)
2483 eval_sv (coderef, 0); 3160 eval_sv (coderef, 0);
2484 else 3161 else
2485 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3162 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2486 3163
2487 POPSTACK; 3164 POPSTACK;
2488 SPAGAIN; 3165 SPAGAIN;
2489 FREETMPS;
2490 LEAVE;
2491 PUTBACK;
2492 }
2493 3166
2494 if (!(coro->flags & CF_RUNNING)) 3167 if (current != coro)
2495 { 3168 {
3169 PUTBACK;
2496 save_perl (aTHX_ coro); 3170 save_perl (aTHX_ coro);
2497 load_perl (aTHX_ &temp); 3171 load_perl (aTHX_ current);
2498 SPAGAIN; 3172 SPAGAIN;
2499 } 3173 }
2500 } 3174 }
2501} 3175}
2502 3176
… …
2506 ALIAS: 3180 ALIAS:
2507 is_ready = CF_READY 3181 is_ready = CF_READY
2508 is_running = CF_RUNNING 3182 is_running = CF_RUNNING
2509 is_new = CF_NEW 3183 is_new = CF_NEW
2510 is_destroyed = CF_DESTROYED 3184 is_destroyed = CF_DESTROYED
3185 is_suspended = CF_SUSPENDED
2511 CODE: 3186 CODE:
2512 RETVAL = boolSV (coro->flags & ix); 3187 RETVAL = boolSV (coro->flags & ix);
2513 OUTPUT: 3188 OUTPUT:
2514 RETVAL 3189 RETVAL
2515 3190
… …
2517throw (Coro::State self, SV *throw = &PL_sv_undef) 3192throw (Coro::State self, SV *throw = &PL_sv_undef)
2518 PROTOTYPE: $;$ 3193 PROTOTYPE: $;$
2519 CODE: 3194 CODE:
2520{ 3195{
2521 struct coro *current = SvSTATE_current; 3196 struct coro *current = SvSTATE_current;
2522 SV **throwp = self == current ? &coro_throw : &self->throw; 3197 SV **throwp = self == current ? &CORO_THROW : &self->except;
2523 SvREFCNT_dec (*throwp); 3198 SvREFCNT_dec (*throwp);
3199 SvGETMAGIC (throw);
2524 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3200 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2525} 3201}
2526 3202
2527void 3203void
2528api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3204api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2531 3207
2532SV * 3208SV *
2533has_cctx (Coro::State coro) 3209has_cctx (Coro::State coro)
2534 PROTOTYPE: $ 3210 PROTOTYPE: $
2535 CODE: 3211 CODE:
2536 RETVAL = boolSV (!!coro->cctx); 3212 /* maybe manage the running flag differently */
3213 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2537 OUTPUT: 3214 OUTPUT:
2538 RETVAL 3215 RETVAL
2539 3216
2540int 3217int
2541is_traced (Coro::State coro) 3218is_traced (Coro::State coro)
… …
2561 3238
2562void 3239void
2563force_cctx () 3240force_cctx ()
2564 PROTOTYPE: 3241 PROTOTYPE:
2565 CODE: 3242 CODE:
2566 SvSTATE_current->cctx->idle_sp = 0; 3243 cctx_current->idle_sp = 0;
2567 3244
2568void 3245void
2569swap_defsv (Coro::State self) 3246swap_defsv (Coro::State self)
2570 PROTOTYPE: $ 3247 PROTOTYPE: $
2571 ALIAS: 3248 ALIAS:
… …
2579 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3256 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2580 3257
2581 SV *tmp = *src; *src = *dst; *dst = tmp; 3258 SV *tmp = *src; *src = *dst; *dst = tmp;
2582 } 3259 }
2583 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}
2584 3304
2585MODULE = Coro::State PACKAGE = Coro 3305MODULE = Coro::State PACKAGE = Coro
2586 3306
2587BOOT: 3307BOOT:
2588{ 3308{
2589 int i;
2590
2591 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2592 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3309 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2593 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3310 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2594 3311 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3312 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2595 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3313 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2596 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);
2597 3323
2598 coro_stash = gv_stashpv ("Coro", TRUE); 3324 coro_stash = gv_stashpv ("Coro", TRUE);
2599 3325
2600 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3326 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2601 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3327 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2602 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3328 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2603 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3329 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2604 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3330 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2605 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3331 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2606
2607 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2608 coro_ready[i] = newAV ();
2609 3332
2610 { 3333 {
2611 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3334 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2612 3335
2613 coroapi.schedule = api_schedule; 3336 coroapi.schedule = api_schedule;
3337 coroapi.schedule_to = api_schedule_to;
2614 coroapi.cede = api_cede; 3338 coroapi.cede = api_cede;
2615 coroapi.cede_notself = api_cede_notself; 3339 coroapi.cede_notself = api_cede_notself;
2616 coroapi.ready = api_ready; 3340 coroapi.ready = api_ready;
2617 coroapi.is_ready = api_is_ready; 3341 coroapi.is_ready = api_is_ready;
2618 coroapi.nready = coro_nready; 3342 coroapi.nready = coro_nready;
2619 coroapi.current = coro_current; 3343 coroapi.current = coro_current;
2620 3344
2621 GCoroAPI = &coroapi; 3345 /*GCoroAPI = &coroapi;*/
2622 sv_setiv (sv, (IV)&coroapi); 3346 sv_setiv (sv, (IV)&coroapi);
2623 SvREADONLY_on (sv); 3347 SvREADONLY_on (sv);
2624 } 3348 }
2625} 3349}
3350
3351void
3352terminate (...)
3353 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2626 3355
2627void 3356void
2628schedule (...) 3357schedule (...)
2629 CODE: 3358 CODE:
2630 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);
2631 3370
2632void 3371void
2633cede (...) 3372cede (...)
2634 CODE: 3373 CODE:
2635 CORO_EXECUTE_SLF_XS (slf_init_cede); 3374 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2649void 3388void
2650_set_readyhook (SV *hook) 3389_set_readyhook (SV *hook)
2651 PROTOTYPE: $ 3390 PROTOTYPE: $
2652 CODE: 3391 CODE:
2653 SvREFCNT_dec (coro_readyhook); 3392 SvREFCNT_dec (coro_readyhook);
3393 SvGETMAGIC (hook);
3394 if (SvOK (hook))
3395 {
2654 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3396 coro_readyhook = newSVsv (hook);
3397 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3398 }
3399 else
3400 {
3401 coro_readyhook = 0;
3402 CORO_READYHOOK = 0;
3403 }
2655 3404
2656int 3405int
2657prio (Coro::State coro, int newprio = 0) 3406prio (Coro::State coro, int newprio = 0)
2658 PROTOTYPE: $;$ 3407 PROTOTYPE: $;$
2659 ALIAS: 3408 ALIAS:
… …
2665 if (items > 1) 3414 if (items > 1)
2666 { 3415 {
2667 if (ix) 3416 if (ix)
2668 newprio = coro->prio - newprio; 3417 newprio = coro->prio - newprio;
2669 3418
2670 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3419 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2671 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3420 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2672 3421
2673 coro->prio = newprio; 3422 coro->prio = newprio;
2674 } 3423 }
2675} 3424}
2676 OUTPUT: 3425 OUTPUT:
… …
2690 CODE: 3439 CODE:
2691 RETVAL = coro_nready; 3440 RETVAL = coro_nready;
2692 OUTPUT: 3441 OUTPUT:
2693 RETVAL 3442 RETVAL
2694 3443
2695# for async_pool speedup
2696void 3444void
2697_pool_1 (SV *cb) 3445suspend (Coro::State self)
3446 PROTOTYPE: $
2698 CODE: 3447 CODE:
2699{ 3448 self->flags |= CF_SUSPENDED;
2700 HV *hv = (HV *)SvRV (coro_current);
2701 struct coro *coro = SvSTATE_hv ((SV *)hv);
2702 AV *defav = GvAV (PL_defgv);
2703 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2704 AV *invoke_av;
2705 int i, len;
2706 3449
2707 if (!invoke) 3450void
3451resume (Coro::State self)
3452 PROTOTYPE: $
3453 CODE:
3454 self->flags &= ~CF_SUSPENDED;
3455
3456void
3457_pool_handler (...)
3458 CODE:
3459 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3460
3461void
3462async_pool (SV *cv, ...)
3463 PROTOTYPE: &@
3464 PPCODE:
3465{
3466 HV *hv = (HV *)av_pop (av_async_pool);
3467 AV *av = newAV ();
3468 SV *cb = ST (0);
3469 int i;
3470
3471 av_extend (av, items - 2);
3472 for (i = 1; i < items; ++i)
3473 av_push (av, SvREFCNT_inc_NN (ST (i)));
3474
3475 if ((SV *)hv == &PL_sv_undef)
2708 { 3476 {
2709 SV *old = PL_diehook; 3477 PUSHMARK (SP);
2710 PL_diehook = 0; 3478 EXTEND (SP, 2);
2711 SvREFCNT_dec (old); 3479 PUSHs (sv_Coro);
2712 croak ("\3async_pool terminate\2\n"); 3480 PUSHs ((SV *)cv_pool_handler);
3481 PUTBACK;
3482 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3483 SPAGAIN;
3484
3485 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2713 } 3486 }
2714 3487
2715 SvREFCNT_dec (coro->saved_deffh);
2716 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2717
2718 hv_store (hv, "desc", sizeof ("desc") - 1,
2719 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2720
2721 invoke_av = (AV *)SvRV (invoke);
2722 len = av_len (invoke_av);
2723
2724 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2725
2726 if (len > 0)
2727 { 3488 {
2728 av_fill (defav, len - 1); 3489 struct coro *coro = SvSTATE_hv (hv);
2729 for (i = 0; i < len; ++i) 3490
2730 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3491 assert (!coro->invoke_cb);
3492 assert (!coro->invoke_av);
3493 coro->invoke_cb = SvREFCNT_inc (cb);
3494 coro->invoke_av = av;
2731 } 3495 }
3496
3497 api_ready (aTHX_ (SV *)hv);
3498
3499 if (GIMME_V != G_VOID)
3500 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3501 else
3502 SvREFCNT_dec (hv);
2732} 3503}
3504
3505SV *
3506rouse_cb ()
3507 PROTOTYPE:
3508 CODE:
3509 RETVAL = coro_new_rouse_cb (aTHX);
3510 OUTPUT:
3511 RETVAL
2733 3512
2734void 3513void
2735_pool_2 (SV *cb) 3514rouse_wait (...)
3515 PROTOTYPE: ;$
3516 PPCODE:
3517 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3518
3519void
3520on_enter (SV *block)
3521 ALIAS:
3522 on_leave = 1
3523 PROTOTYPE: &
2736 CODE: 3524 CODE:
2737{ 3525{
2738 HV *hv = (HV *)SvRV (coro_current);
2739 struct coro *coro = SvSTATE_hv ((SV *)hv); 3526 struct coro *coro = SvSTATE_current;
3527 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2740 3528
2741 sv_setsv (cb, &PL_sv_undef); 3529 block = s_get_cv_croak (block);
2742 3530
2743 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3531 if (!*avp)
2744 coro->saved_deffh = 0; 3532 *avp = newAV ();
2745 3533
2746 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3534 av_push (*avp, SvREFCNT_inc (block));
2747 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2748 {
2749 SV *old = PL_diehook;
2750 PL_diehook = 0;
2751 SvREFCNT_dec (old);
2752 croak ("\3async_pool terminate\2\n");
2753 }
2754 3535
2755 av_clear (GvAV (PL_defgv)); 3536 if (!ix)
2756 hv_store (hv, "desc", sizeof ("desc") - 1, 3537 on_enterleave_call (aTHX_ block);
2757 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2758 3538
2759 coro->prio = 0; 3539 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2760 3540 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2761 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3541 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2762 api_trace (aTHX_ coro_current, 0);
2763
2764 av_push (av_async_pool, newSVsv (coro_current));
2765} 3542}
2766 3543
2767 3544
2768MODULE = Coro::State PACKAGE = PerlIO::cede 3545MODULE = Coro::State PACKAGE = PerlIO::cede
2769 3546
… …
2772 3549
2773 3550
2774MODULE = Coro::State PACKAGE = Coro::Semaphore 3551MODULE = Coro::State PACKAGE = Coro::Semaphore
2775 3552
2776SV * 3553SV *
2777new (SV *klass, SV *count_ = 0) 3554new (SV *klass, SV *count = 0)
2778 CODE: 3555 CODE:
2779{ 3556{
2780 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3557 int semcnt = 1;
2781 AV *av = newAV ();
2782 SV **ary;
2783 3558
2784 /* unfortunately, building manually saves memory */ 3559 if (count)
2785 Newx (ary, 2, SV *); 3560 {
2786 AvALLOC (av) = ary; 3561 SvGETMAGIC (count);
2787 AvARRAY (av) = ary;
2788 AvMAX (av) = 1;
2789 AvFILLp (av) = 0;
2790 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2791 3562
2792 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3563 if (SvOK (count))
3564 semcnt = SvIV (count);
3565 }
3566
3567 RETVAL = sv_bless (
3568 coro_waitarray_new (aTHX_ semcnt),
3569 GvSTASH (CvGV (cv))
3570 );
2793} 3571}
3572 OUTPUT:
3573 RETVAL
3574
3575# helper for Coro::Channel and others
3576SV *
3577_alloc (int count)
3578 CODE:
3579 RETVAL = coro_waitarray_new (aTHX_ count);
2794 OUTPUT: 3580 OUTPUT:
2795 RETVAL 3581 RETVAL
2796 3582
2797SV * 3583SV *
2798count (SV *self) 3584count (SV *self)
… …
2807 adjust = 1 3593 adjust = 1
2808 CODE: 3594 CODE:
2809 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3595 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2810 3596
2811void 3597void
2812down (SV *self) 3598down (...)
2813 CODE: 3599 CODE:
2814 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3600 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3601
3602void
3603wait (...)
3604 CODE:
3605 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2815 3606
2816void 3607void
2817try (SV *self) 3608try (SV *self)
2818 PPCODE: 3609 PPCODE:
2819{ 3610{
… …
2831 XSRETURN_NO; 3622 XSRETURN_NO;
2832} 3623}
2833 3624
2834void 3625void
2835waiters (SV *self) 3626waiters (SV *self)
2836 CODE: 3627 PPCODE:
2837{ 3628{
2838 AV *av = (AV *)SvRV (self); 3629 AV *av = (AV *)SvRV (self);
3630 int wcount = AvFILLp (av) + 1 - 1;
2839 3631
2840 if (GIMME_V == G_SCALAR) 3632 if (GIMME_V == G_SCALAR)
2841 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3633 XPUSHs (sv_2mortal (newSViv (wcount)));
2842 else 3634 else
2843 { 3635 {
2844 int i; 3636 int i;
2845 EXTEND (SP, AvFILLp (av) + 1 - 1); 3637 EXTEND (SP, wcount);
2846 for (i = 1; i <= AvFILLp (av); ++i) 3638 for (i = 1; i <= wcount; ++i)
2847 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3639 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2848 } 3640 }
2849} 3641}
3642
3643MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3644
3645void
3646_may_delete (SV *sem, int count, int extra_refs)
3647 PPCODE:
3648{
3649 AV *av = (AV *)SvRV (sem);
3650
3651 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3652 && AvFILLp (av) == 0 /* no waiters, just count */
3653 && SvIV (AvARRAY (av)[0]) == count)
3654 XSRETURN_YES;
3655
3656 XSRETURN_NO;
3657}
3658
3659MODULE = Coro::State PACKAGE = Coro::Signal
3660
3661SV *
3662new (SV *klass)
3663 CODE:
3664 RETVAL = sv_bless (
3665 coro_waitarray_new (aTHX_ 0),
3666 GvSTASH (CvGV (cv))
3667 );
3668 OUTPUT:
3669 RETVAL
3670
3671void
3672wait (...)
3673 CODE:
3674 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3675
3676void
3677broadcast (SV *self)
3678 CODE:
3679{
3680 AV *av = (AV *)SvRV (self);
3681 coro_signal_wake (aTHX_ av, AvFILLp (av));
3682}
3683
3684void
3685send (SV *self)
3686 CODE:
3687{
3688 AV *av = (AV *)SvRV (self);
3689
3690 if (AvFILLp (av))
3691 coro_signal_wake (aTHX_ av, 1);
3692 else
3693 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3694}
3695
3696IV
3697awaited (SV *self)
3698 CODE:
3699 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3700 OUTPUT:
3701 RETVAL
2850 3702
2851 3703
2852MODULE = Coro::State PACKAGE = Coro::AnyEvent 3704MODULE = Coro::State PACKAGE = Coro::AnyEvent
2853 3705
2854BOOT: 3706BOOT:
… …
2882 3734
2883void 3735void
2884_register (char *target, char *proto, SV *req) 3736_register (char *target, char *proto, SV *req)
2885 CODE: 3737 CODE:
2886{ 3738{
2887 HV *st; 3739 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 */ 3740 /* newXSproto doesn't return the CV on 5.8 */
2891 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3741 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2892 sv_setpv ((SV *)slf_cv, proto); 3742 sv_setpv ((SV *)slf_cv, proto);
2893 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3743 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2894} 3744}
2895 3745
3746MODULE = Coro::State PACKAGE = Coro::Select
3747
3748void
3749patch_pp_sselect ()
3750 CODE:
3751 if (!coro_old_pp_sselect)
3752 {
3753 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3754 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3755 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3756 }
3757
3758void
3759unpatch_pp_sselect ()
3760 CODE:
3761 if (coro_old_pp_sselect)
3762 {
3763 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3764 coro_old_pp_sselect = 0;
3765 }
3766
3767

Diff Legend

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