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.363 by root, Tue Jul 14 00:55:10 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
294 287
295/** lowlevel stuff **********************************************************/ 288/** lowlevel stuff **********************************************************/
296 289
… …
322 get_hv (name, create); 315 get_hv (name, create);
323#endif 316#endif
324 return get_hv (name, create); 317 return get_hv (name, create);
325} 318}
326 319
320INLINE void
321coro_times_update ()
322{
323#ifdef coro_clock_gettime
324 struct timespec ts;
325
326 ts.tv_sec = ts.tv_nsec = 0;
327 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
328 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
329
330 ts.tv_sec = ts.tv_nsec = 0;
331 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
332 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
333#else
334 dTHX;
335 UV tv[2];
336
337 u2time (aTHX_ tv);
338 time_real [0] = tv [0];
339 time_real [1] = tv [1] * 1000;
340#endif
341}
342
343INLINE void
344coro_times_add (struct coro *c)
345{
346 c->t_real [1] += time_real [1];
347 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
348 c->t_real [0] += time_real [0];
349
350 c->t_cpu [1] += time_cpu [1];
351 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
352 c->t_cpu [0] += time_cpu [0];
353}
354
355INLINE void
356coro_times_sub (struct coro *c)
357{
358 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
359 c->t_real [1] -= time_real [1];
360 c->t_real [0] -= time_real [0];
361
362 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
363 c->t_cpu [1] -= time_cpu [1];
364 c->t_cpu [0] -= time_cpu [0];
365}
366
367/*****************************************************************************/
368/* magic glue */
369
370#define CORO_MAGIC_type_cv 26
371#define CORO_MAGIC_type_state PERL_MAGIC_ext
372
373#define CORO_MAGIC_NN(sv, type) \
374 (expect_true (SvMAGIC (sv)->mg_type == type) \
375 ? SvMAGIC (sv) \
376 : mg_find (sv, type))
377
378#define CORO_MAGIC(sv, type) \
379 (expect_true (SvMAGIC (sv)) \
380 ? CORO_MAGIC_NN (sv, type) \
381 : 0)
382
383#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
384#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
385
386INLINE struct coro *
387SvSTATE_ (pTHX_ SV *coro)
388{
389 HV *stash;
390 MAGIC *mg;
391
392 if (SvROK (coro))
393 coro = SvRV (coro);
394
395 if (expect_false (SvTYPE (coro) != SVt_PVHV))
396 croak ("Coro::State object required");
397
398 stash = SvSTASH (coro);
399 if (expect_false (stash != coro_stash && stash != coro_state_stash))
400 {
401 /* very slow, but rare, check */
402 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
403 croak ("Coro::State object required");
404 }
405
406 mg = CORO_MAGIC_state (coro);
407 return (struct coro *)mg->mg_ptr;
408}
409
410#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
411
412/* faster than SvSTATE, but expects a coroutine hv */
413#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
414#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
415
416/*****************************************************************************/
417/* padlist management and caching */
418
327static AV * 419static AV *
328coro_clone_padlist (pTHX_ CV *cv) 420coro_derive_padlist (pTHX_ CV *cv)
329{ 421{
330 AV *padlist = CvPADLIST (cv); 422 AV *padlist = CvPADLIST (cv);
331 AV *newpadlist, *newpad; 423 AV *newpadlist, *newpad;
332 424
333 newpadlist = newAV (); 425 newpadlist = newAV ();
… …
338 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 430 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
339#endif 431#endif
340 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 432 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
341 --AvFILLp (padlist); 433 --AvFILLp (padlist);
342 434
343 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 435 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
344 av_store (newpadlist, 1, (SV *)newpad); 436 av_store (newpadlist, 1, (SV *)newpad);
345 437
346 return newpadlist; 438 return newpadlist;
347} 439}
348 440
349static void 441static void
350free_padlist (pTHX_ AV *padlist) 442free_padlist (pTHX_ AV *padlist)
351{ 443{
352 /* may be during global destruction */ 444 /* may be during global destruction */
353 if (SvREFCNT (padlist)) 445 if (!IN_DESTRUCT)
354 { 446 {
355 I32 i = AvFILLp (padlist); 447 I32 i = AvFILLp (padlist);
356 while (i >= 0) 448
449 while (i > 0) /* special-case index 0 */
357 { 450 {
358 SV **svp = av_fetch (padlist, i--, FALSE); 451 /* we try to be extra-careful here */
359 if (svp) 452 AV *av = (AV *)AvARRAY (padlist)[i--];
360 { 453 I32 j = AvFILLp (av);
361 SV *sv; 454
362 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 455 while (j >= 0)
456 SvREFCNT_dec (AvARRAY (av)[j--]);
457
458 AvFILLp (av) = -1;
363 SvREFCNT_dec (sv); 459 SvREFCNT_dec (av);
364
365 SvREFCNT_dec (*svp);
366 }
367 } 460 }
368 461
462 SvREFCNT_dec (AvARRAY (padlist)[0]);
463
464 AvFILLp (padlist) = -1;
369 SvREFCNT_dec ((SV*)padlist); 465 SvREFCNT_dec ((SV*)padlist);
370 } 466 }
371} 467}
372 468
373static int 469static int
374coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 470coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
375{ 471{
376 AV *padlist; 472 AV *padlist;
377 AV *av = (AV *)mg->mg_obj; 473 AV *av = (AV *)mg->mg_obj;
474
475 /* perl manages to free our internal AV and _then_ call us */
476 if (IN_DESTRUCT)
477 return 0;
378 478
379 /* casting is fun. */ 479 /* casting is fun. */
380 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
381 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
382 482
383 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 483 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
384 484
385 return 0; 485 return 0;
386} 486}
387
388#define CORO_MAGIC_type_cv 26
389#define CORO_MAGIC_type_state PERL_MAGIC_ext
390 487
391static MGVTBL coro_cv_vtbl = { 488static MGVTBL coro_cv_vtbl = {
392 0, 0, 0, 0, 489 0, 0, 0, 0,
393 coro_cv_free 490 coro_cv_free
394}; 491};
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 492
439/* the next two functions merely cache the padlists */ 493/* the next two functions merely cache the padlists */
440static void 494static void
441get_padlist (pTHX_ CV *cv) 495get_padlist (pTHX_ CV *cv)
442{ 496{
… …
448 else 502 else
449 { 503 {
450#if CORO_PREFER_PERL_FUNCTIONS 504#if CORO_PREFER_PERL_FUNCTIONS
451 /* this is probably cleaner? but also slower! */ 505 /* this is probably cleaner? but also slower! */
452 /* in practise, it seems to be less stable */ 506 /* in practise, it seems to be less stable */
453 CV *cp = Perl_cv_clone (cv); 507 CV *cp = Perl_cv_clone (aTHX_ cv);
454 CvPADLIST (cv) = CvPADLIST (cp); 508 CvPADLIST (cv) = CvPADLIST (cp);
455 CvPADLIST (cp) = 0; 509 CvPADLIST (cp) = 0;
456 SvREFCNT_dec (cp); 510 SvREFCNT_dec (cp);
457#else 511#else
458 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 512 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
459#endif 513#endif
460 } 514 }
461} 515}
462 516
463static void 517static void
… …
470 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 524 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
471 525
472 av = (AV *)mg->mg_obj; 526 av = (AV *)mg->mg_obj;
473 527
474 if (expect_false (AvFILLp (av) >= AvMAX (av))) 528 if (expect_false (AvFILLp (av) >= AvMAX (av)))
475 av_extend (av, AvMAX (av) + 1); 529 av_extend (av, AvFILLp (av) + 1);
476 530
477 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 531 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
478} 532}
479 533
480/** load & save, init *******************************************************/ 534/** load & save, init *******************************************************/
535
536static void
537on_enterleave_call (pTHX_ SV *cb);
481 538
482static void 539static void
483load_perl (pTHX_ Coro__State c) 540load_perl (pTHX_ Coro__State c)
484{ 541{
485 perl_slots *slot = c->slot; 542 perl_slots *slot = c->slot;
486 c->slot = 0; 543 c->slot = 0;
487 544
488 PL_mainstack = c->mainstack; 545 PL_mainstack = c->mainstack;
489 546
490 GvSV (PL_defgv) = slot->defsv; 547 GvSV (PL_defgv) = slot->defsv;
491 GvAV (PL_defgv) = slot->defav; 548 GvAV (PL_defgv) = slot->defav;
492 GvSV (PL_errgv) = slot->errsv; 549 GvSV (PL_errgv) = slot->errsv;
493 GvSV (irsgv) = slot->irsgv; 550 GvSV (irsgv) = slot->irsgv;
551 GvHV (PL_hintgv) = slot->hinthv;
494 552
495 #define VAR(name,type) PL_ ## name = slot->name; 553 #define VAR(name,type) PL_ ## name = slot->name;
496 # include "state.h" 554 # include "state.h"
497 #undef VAR 555 #undef VAR
498 556
… …
511 569
512 PUTBACK; 570 PUTBACK;
513 } 571 }
514 572
515 slf_frame = c->slf_frame; 573 slf_frame = c->slf_frame;
516 coro_throw = c->throw; 574 CORO_THROW = c->except;
575
576 if (expect_false (enable_times))
577 {
578 if (expect_false (!times_valid))
579 coro_times_update ();
580
581 coro_times_sub (c);
582 }
583
584 if (expect_false (c->on_enter))
585 {
586 int i;
587
588 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
589 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
590 }
517} 591}
518 592
519static void 593static void
520save_perl (pTHX_ Coro__State c) 594save_perl (pTHX_ Coro__State c)
521{ 595{
522 c->throw = coro_throw; 596 if (expect_false (c->on_leave))
597 {
598 int i;
599
600 for (i = AvFILLp (c->on_leave); i >= 0; --i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
602 }
603
604 times_valid = 0;
605
606 if (expect_false (enable_times))
607 {
608 coro_times_update (); times_valid = 1;
609 coro_times_add (c);
610 }
611
612 c->except = CORO_THROW;
523 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
524 614
525 { 615 {
526 dSP; 616 dSP;
527 I32 cxix = cxstack_ix; 617 I32 cxix = cxstack_ix;
… …
539 { 629 {
540 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
541 { 631 {
542 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
543 633
544 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
545 { 635 {
546 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
547 637
548 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
549 { 639 {
… …
573 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
574 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
575 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
576 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
577 { 667 {
578 int i; 668 unsigned int i;
579 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
580 CXINC; 670 CXINC;
581 } 671 }
582 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
583 673
584 c->mainstack = PL_mainstack; 674 c->mainstack = PL_mainstack;
585 675
586 { 676 {
587 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
588 678
589 slot->defav = GvAV (PL_defgv); 679 slot->defav = GvAV (PL_defgv);
590 slot->defsv = DEFSV; 680 slot->defsv = DEFSV;
591 slot->errsv = ERRSV; 681 slot->errsv = ERRSV;
592 slot->irsgv = GvSV (irsgv); 682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
593 684
594 #define VAR(name,type) slot->name = PL_ ## name; 685 #define VAR(name,type) slot->name = PL_ ## name;
595 # include "state.h" 686 # include "state.h"
596 #undef VAR 687 #undef VAR
597 } 688 }
… …
602 * of perl.c:init_stacks, except that it uses less memory 693 * of perl.c:init_stacks, except that it uses less memory
603 * on the (sometimes correct) assumption that coroutines do 694 * on the (sometimes correct) assumption that coroutines do
604 * not usually need a lot of stackspace. 695 * not usually need a lot of stackspace.
605 */ 696 */
606#if CORO_PREFER_PERL_FUNCTIONS 697#if CORO_PREFER_PERL_FUNCTIONS
607# define coro_init_stacks init_stacks 698# define coro_init_stacks(thx) init_stacks ()
608#else 699#else
609static void 700static void
610coro_init_stacks (pTHX) 701coro_init_stacks (pTHX)
611{ 702{
612 PL_curstackinfo = new_stackinfo(32, 8); 703 PL_curstackinfo = new_stackinfo(32, 8);
… …
675#if !PERL_VERSION_ATLEAST (5,10,0) 766#if !PERL_VERSION_ATLEAST (5,10,0)
676 Safefree (PL_retstack); 767 Safefree (PL_retstack);
677#endif 768#endif
678} 769}
679 770
771#define CORO_RSS \
772 rss += sizeof (SYM (curstackinfo)); \
773 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
774 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
775 rss += SYM (tmps_max) * sizeof (SV *); \
776 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
777 rss += SYM (scopestack_max) * sizeof (I32); \
778 rss += SYM (savestack_max) * sizeof (ANY);
779
680static size_t 780static size_t
681coro_rss (pTHX_ struct coro *coro) 781coro_rss (pTHX_ struct coro *coro)
682{ 782{
683 size_t rss = sizeof (*coro); 783 size_t rss = sizeof (*coro);
684 784
685 if (coro->mainstack) 785 if (coro->mainstack)
686 { 786 {
687 perl_slots tmp_slot;
688 perl_slots *slot;
689
690 if (coro->flags & CF_RUNNING) 787 if (coro->flags & CF_RUNNING)
691 { 788 {
692 slot = &tmp_slot; 789 #define SYM(sym) PL_ ## sym
693 790 CORO_RSS;
694 #define VAR(name,type) slot->name = PL_ ## name;
695 # include "state.h"
696 #undef VAR 791 #undef SYM
697 } 792 }
698 else 793 else
699 slot = coro->slot;
700
701 if (slot)
702 { 794 {
703 rss += sizeof (slot->curstackinfo); 795 #define SYM(sym) coro->slot->sym
704 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 796 CORO_RSS;
705 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 797 #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 } 798 }
715 } 799 }
716 800
717 return rss; 801 return rss;
718} 802}
… …
731#endif 815#endif
732 816
733/* 817/*
734 * This overrides the default magic get method of %SIG elements. 818 * 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 819 * 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 820 * and instead of trying to save and restore the hash elements, we just provide
737 * readback here. 821 * 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 */ 822 */
742static int 823static int
743coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
744{ 825{
745 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
… …
798 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
799 880
800 if (svp) 881 if (svp)
801 { 882 {
802 SV *old = *svp; 883 SV *old = *svp;
803 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
804 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
805 return 0; 886 return 0;
806 } 887 }
807 } 888 }
808 889
… …
818 899
819static int 900static int
820slf_check_nop (pTHX_ struct CoroSLF *frame) 901slf_check_nop (pTHX_ struct CoroSLF *frame)
821{ 902{
822 return 0; 903 return 0;
904}
905
906static int
907slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{
909 return 1;
823} 910}
824 911
825static UNOP coro_setup_op; 912static UNOP coro_setup_op;
826 913
827static void NOINLINE /* noinline to keep it out of the transfer fast path */ 914static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
834 921
835 PL_runops = RUNOPS_DEFAULT; 922 PL_runops = RUNOPS_DEFAULT;
836 PL_curcop = &PL_compiling; 923 PL_curcop = &PL_compiling;
837 PL_in_eval = EVAL_NULL; 924 PL_in_eval = EVAL_NULL;
838 PL_comppad = 0; 925 PL_comppad = 0;
926 PL_comppad_name = 0;
927 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0;
839 PL_curpm = 0; 929 PL_curpm = 0;
840 PL_curpad = 0; 930 PL_curpad = 0;
841 PL_localizing = 0; 931 PL_localizing = 0;
842 PL_dirty = 0; 932 PL_dirty = 0;
843 PL_restartop = 0; 933 PL_restartop = 0;
844#if PERL_VERSION_ATLEAST (5,10,0) 934#if PERL_VERSION_ATLEAST (5,10,0)
845 PL_parser = 0; 935 PL_parser = 0;
846#endif 936#endif
937 PL_hints = 0;
847 938
848 /* recreate the die/warn hooks */ 939 /* recreate the die/warn hooks */
849 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 940 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); 941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
851 942
852 GvSV (PL_defgv) = newSV (0); 943 GvSV (PL_defgv) = newSV (0);
853 GvAV (PL_defgv) = coro->args; coro->args = 0; 944 GvAV (PL_defgv) = coro->args; coro->args = 0;
854 GvSV (PL_errgv) = newSV (0); 945 GvSV (PL_errgv) = newSV (0);
855 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0;
856 PL_rs = newSVsv (GvSV (irsgv)); 948 PL_rs = newSVsv (GvSV (irsgv));
857 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
858 950
859 { 951 {
860 dSP; 952 dSP;
861 UNOP myop; 953 UNOP myop;
862 954
863 Zero (&myop, 1, UNOP); 955 Zero (&myop, 1, UNOP);
864 myop.op_next = Nullop; 956 myop.op_next = Nullop;
957 myop.op_type = OP_ENTERSUB;
865 myop.op_flags = OPf_WANT_VOID; 958 myop.op_flags = OPf_WANT_VOID;
866 959
867 PUSHMARK (SP); 960 PUSHMARK (SP);
868 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 961 PUSHs ((SV *)coro->startcv);
869 PUTBACK; 962 PUTBACK;
870 PL_op = (OP *)&myop; 963 PL_op = (OP *)&myop;
871 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 964 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
872 SPAGAIN;
873 } 965 }
874 966
875 /* this newly created coroutine might be run on an existing cctx which most 967 /* 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. 968 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
877 */ 969 */
878 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 970 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 */ 971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
880 972
881 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 973 /* 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; 974 coro_setup_op.op_next = PL_op;
883 coro_setup_op.op_type = OP_CUSTOM; 975 coro_setup_op.op_type = OP_ENTERSUB;
884 coro_setup_op.op_ppaddr = pp_slf; 976 coro_setup_op.op_ppaddr = pp_slf;
885 /* no flags required, as an init function won't be called */ 977 /* no flags etc. required, as an init function won't be called */
886 978
887 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
888 980
889 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
890 coro_throw = coro->throw; 982 CORO_THROW = coro->except;
891}
892 983
984 if (expect_false (enable_times))
985 {
986 coro_times_update ();
987 coro_times_sub (coro);
988 }
989}
990
893static void 991static void
894coro_destruct (pTHX_ struct coro *coro) 992coro_unwind_stacks (pTHX)
895{ 993{
896 if (!IN_DESTRUCT) 994 if (!IN_DESTRUCT)
897 { 995 {
898 /* restore all saved variables and stuff */ 996 /* restore all saved variables and stuff */
899 LEAVE_SCOPE (0); 997 LEAVE_SCOPE (0);
… …
907 POPSTACK_TO (PL_mainstack); 1005 POPSTACK_TO (PL_mainstack);
908 1006
909 /* unwind main stack */ 1007 /* unwind main stack */
910 dounwind (-1); 1008 dounwind (-1);
911 } 1009 }
1010}
912 1011
913 SvREFCNT_dec (GvSV (PL_defgv)); 1012static void
914 SvREFCNT_dec (GvAV (PL_defgv)); 1013coro_destruct_perl (pTHX_ struct coro *coro)
915 SvREFCNT_dec (GvSV (PL_errgv)); 1014{
916 SvREFCNT_dec (PL_defoutgv); 1015 SV *svf [9];
917 SvREFCNT_dec (PL_rs);
918 SvREFCNT_dec (GvSV (irsgv));
919 1016
920 SvREFCNT_dec (PL_diehook);
921 SvREFCNT_dec (PL_warnhook);
922 1017 {
1018 struct coro *current = SvSTATE_current;
1019
1020 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1021
1022 save_perl (aTHX_ current);
1023 load_perl (aTHX_ coro);
1024
1025 coro_unwind_stacks (aTHX);
1026 coro_destruct_stacks (aTHX);
1027
1028 // now save some sv's to be free'd later
1029 svf [0] = GvSV (PL_defgv);
1030 svf [1] = (SV *)GvAV (PL_defgv);
1031 svf [2] = GvSV (PL_errgv);
1032 svf [3] = (SV *)PL_defoutgv;
1033 svf [4] = PL_rs;
1034 svf [5] = GvSV (irsgv);
1035 svf [6] = (SV *)GvHV (PL_hintgv);
1036 svf [7] = PL_diehook;
1037 svf [8] = PL_warnhook;
1038 assert (9 == sizeof (svf) / sizeof (*svf));
1039
1040 load_perl (aTHX_ current);
1041 }
1042
1043 {
1044 unsigned int i;
1045
1046 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1047 SvREFCNT_dec (svf [i]);
1048
923 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
924 SvREFCNT_dec (coro_throw); 1050 SvREFCNT_dec (coro->rouse_cb);
925 1051 SvREFCNT_dec (coro->invoke_cb);
926 coro_destruct_stacks (aTHX); 1052 SvREFCNT_dec (coro->invoke_av);
1053 }
927} 1054}
928 1055
929INLINE void 1056INLINE void
930free_coro_mortal (pTHX) 1057free_coro_mortal (pTHX)
931{ 1058{
… …
939static int 1066static int
940runops_trace (pTHX) 1067runops_trace (pTHX)
941{ 1068{
942 COP *oldcop = 0; 1069 COP *oldcop = 0;
943 int oldcxix = -2; 1070 int oldcxix = -2;
944 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
945 coro_cctx *cctx = coro->cctx;
946 1071
947 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1072 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
948 { 1073 {
949 PERL_ASYNC_CHECK (); 1074 PERL_ASYNC_CHECK ();
950 1075
951 if (cctx->flags & CC_TRACE_ALL) 1076 if (cctx_current->flags & CC_TRACE_ALL)
952 { 1077 {
953 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1078 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
954 { 1079 {
955 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1080 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
956 SV **bot, **top; 1081 SV **bot, **top;
957 AV *av = newAV (); /* return values */ 1082 AV *av = newAV (); /* return values */
958 SV **cb; 1083 SV **cb;
… …
995 1120
996 if (PL_curcop != &PL_compiling) 1121 if (PL_curcop != &PL_compiling)
997 { 1122 {
998 SV **cb; 1123 SV **cb;
999 1124
1000 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1125 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1001 { 1126 {
1002 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1127 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1003 1128
1004 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1129 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1005 { 1130 {
1006 runops_proc_t old_runops = PL_runops;
1007 dSP; 1131 dSP;
1008 GV *gv = CvGV (cx->blk_sub.cv); 1132 GV *gv = CvGV (cx->blk_sub.cv);
1009 SV *fullname = sv_2mortal (newSV (0)); 1133 SV *fullname = sv_2mortal (newSV (0));
1010 1134
1011 if (isGV (gv)) 1135 if (isGV (gv))
… …
1016 SAVETMPS; 1140 SAVETMPS;
1017 EXTEND (SP, 3); 1141 EXTEND (SP, 3);
1018 PUSHMARK (SP); 1142 PUSHMARK (SP);
1019 PUSHs (&PL_sv_yes); 1143 PUSHs (&PL_sv_yes);
1020 PUSHs (fullname); 1144 PUSHs (fullname);
1021 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1145 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1022 PUTBACK; 1146 PUTBACK;
1023 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1147 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); 1148 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1025 SPAGAIN; 1149 SPAGAIN;
1026 FREETMPS; 1150 FREETMPS;
… …
1029 } 1153 }
1030 1154
1031 oldcxix = cxstack_ix; 1155 oldcxix = cxstack_ix;
1032 } 1156 }
1033 1157
1034 if (cctx->flags & CC_TRACE_LINE) 1158 if (cctx_current->flags & CC_TRACE_LINE)
1035 { 1159 {
1036 dSP; 1160 dSP;
1037 1161
1038 PL_runops = RUNOPS_DEFAULT; 1162 PL_runops = RUNOPS_DEFAULT;
1039 ENTER; 1163 ENTER;
… …
1058 1182
1059 TAINT_NOT; 1183 TAINT_NOT;
1060 return 0; 1184 return 0;
1061} 1185}
1062 1186
1063static struct coro_cctx *cctx_ssl_cctx;
1064static struct CoroSLF cctx_ssl_frame; 1187static struct CoroSLF cctx_ssl_frame;
1065 1188
1066static void 1189static void
1067slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1190slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1068{ 1191{
1069 ta->prev = (struct coro *)cctx_ssl_cctx;
1070 ta->next = 0; 1192 ta->prev = 0;
1071} 1193}
1072 1194
1073static int 1195static int
1074slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1196slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1075{ 1197{
… …
1078 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1200 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1079} 1201}
1080 1202
1081/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1203/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1082static void NOINLINE 1204static void NOINLINE
1083cctx_prepare (pTHX_ coro_cctx *cctx) 1205cctx_prepare (pTHX)
1084{ 1206{
1085 PL_top_env = &PL_start_env; 1207 PL_top_env = &PL_start_env;
1086 1208
1087 if (cctx->flags & CC_TRACE) 1209 if (cctx_current->flags & CC_TRACE)
1088 PL_runops = runops_trace; 1210 PL_runops = runops_trace;
1089 1211
1090 /* we already must be executing an SLF op, there is no other valid way 1212 /* we already must be executing an SLF op, there is no other valid way
1091 * that can lead to creation of a new cctx */ 1213 * that can lead to creation of a new cctx */
1092 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1214 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1093 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1215 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1094 1216
1095 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1217 /* 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; 1218 cctx_ssl_frame = slf_frame;
1098 1219
1099 slf_frame.prepare = slf_prepare_set_stacklevel; 1220 slf_frame.prepare = slf_prepare_set_stacklevel;
1100 slf_frame.check = slf_check_set_stacklevel; 1221 slf_frame.check = slf_check_set_stacklevel;
1101} 1222}
… …
1124 /* normally we would need to skip the entersub here */ 1245 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */ 1246 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */ 1247 /* PL_nop = PL_nop->op_next */
1127 1248
1128 /* inject a fake subroutine call to cctx_init */ 1249 /* inject a fake subroutine call to cctx_init */
1129 cctx_prepare (aTHX_ (coro_cctx *)arg); 1250 cctx_prepare (aTHX);
1130 1251
1131 /* cctx_run is the alternative tail of transfer() */ 1252 /* cctx_run is the alternative tail of transfer() */
1132 transfer_tail (aTHX); 1253 transfer_tail (aTHX);
1133 1254
1134 /* somebody or something will hit me for both perl_run and PL_restartop */ 1255 /* somebody or something will hit me for both perl_run and PL_restartop */
1135 PL_restartop = PL_op; 1256 PL_restartop = PL_op;
1136 perl_run (PL_curinterp); 1257 perl_run (PL_curinterp);
1258 /*
1259 * Unfortunately, there is no way to get at the return values of the
1260 * coro body here, as perl_run destroys these
1261 */
1137 1262
1138 /* 1263 /*
1139 * If perl-run returns we assume exit() was being called or the coro 1264 * 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) 1265 * 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 1266 * 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" 1267 * bootstrap-time "top" top_env, as we cannot restore the "main"
1143 * coroutine as Coro has no such concept 1268 * coroutine as Coro has no such concept.
1269 * This actually isn't valid with the pthread backend, but OSes requiring
1270 * that backend are too broken to do it in a standards-compliant way.
1144 */ 1271 */
1145 PL_top_env = main_top_env; 1272 PL_top_env = main_top_env;
1146 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1273 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1147 } 1274 }
1148} 1275}
… …
1225cctx_destroy (coro_cctx *cctx) 1352cctx_destroy (coro_cctx *cctx)
1226{ 1353{
1227 if (!cctx) 1354 if (!cctx)
1228 return; 1355 return;
1229 1356
1357 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1358
1230 --cctx_count; 1359 --cctx_count;
1231 coro_destroy (&cctx->cctx); 1360 coro_destroy (&cctx->cctx);
1232 1361
1233 /* coro_transfer creates new, empty cctx's */ 1362 /* coro_transfer creates new, empty cctx's */
1234 if (cctx->sptr) 1363 if (cctx->sptr)
… …
1297 /* TODO: throwing up here is considered harmful */ 1426 /* TODO: throwing up here is considered harmful */
1298 1427
1299 if (expect_true (prev != next)) 1428 if (expect_true (prev != next))
1300 { 1429 {
1301 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1430 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,"); 1431 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1303 1432
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)) 1433 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,"); 1434 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1309 1435
1310#if !PERL_VERSION_ATLEAST (5,10,0) 1436#if !PERL_VERSION_ATLEAST (5,10,0)
1311 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1437 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,"); 1438 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1313#endif 1439#endif
… …
1319transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1445transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1320{ 1446{
1321 dSTACKLEVEL; 1447 dSTACKLEVEL;
1322 1448
1323 /* sometimes transfer is only called to set idle_sp */ 1449 /* sometimes transfer is only called to set idle_sp */
1324 if (expect_false (!next)) 1450 if (expect_false (!prev))
1325 { 1451 {
1326 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1452 cctx_current->idle_sp = STACKLEVEL;
1327 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1453 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1328 } 1454 }
1329 else if (expect_true (prev != next)) 1455 else if (expect_true (prev != next))
1330 { 1456 {
1331 coro_cctx *prev__cctx; 1457 coro_cctx *cctx_prev;
1332 1458
1333 if (expect_false (prev->flags & CF_NEW)) 1459 if (expect_false (prev->flags & CF_NEW))
1334 { 1460 {
1335 /* create a new empty/source context */ 1461 /* create a new empty/source context */
1336 prev->cctx = cctx_new_empty ();
1337 prev->flags &= ~CF_NEW; 1462 prev->flags &= ~CF_NEW;
1338 prev->flags |= CF_RUNNING; 1463 prev->flags |= CF_RUNNING;
1339 } 1464 }
1340 1465
1341 prev->flags &= ~CF_RUNNING; 1466 prev->flags &= ~CF_RUNNING;
… …
1352 coro_setup (aTHX_ next); 1477 coro_setup (aTHX_ next);
1353 } 1478 }
1354 else 1479 else
1355 load_perl (aTHX_ next); 1480 load_perl (aTHX_ next);
1356 1481
1357 prev__cctx = prev->cctx;
1358
1359 /* possibly untie and reuse the cctx */ 1482 /* possibly untie and reuse the cctx */
1360 if (expect_true ( 1483 if (expect_true (
1361 prev__cctx->idle_sp == STACKLEVEL 1484 cctx_current->idle_sp == STACKLEVEL
1362 && !(prev__cctx->flags & CC_TRACE) 1485 && !(cctx_current->flags & CC_TRACE)
1363 && !force_cctx 1486 && !force_cctx
1364 )) 1487 ))
1365 { 1488 {
1366 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1489 /* 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)); 1490 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1368 1491
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 */ 1492 /* 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 */ 1493 /* without this the next cctx_get might destroy the running cctx while still in use */
1373 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1494 if (expect_false (CCTX_EXPIRED (cctx_current)))
1374 if (!next->cctx) 1495 if (expect_true (!next->cctx))
1375 next->cctx = cctx_get (aTHX); 1496 next->cctx = cctx_get (aTHX);
1376 1497
1377 cctx_put (prev__cctx); 1498 cctx_put (cctx_current);
1378 } 1499 }
1500 else
1501 prev->cctx = cctx_current;
1379 1502
1380 ++next->usecount; 1503 ++next->usecount;
1381 1504
1382 if (expect_true (!next->cctx)) 1505 cctx_prev = cctx_current;
1383 next->cctx = cctx_get (aTHX); 1506 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1384 1507
1385 if (expect_false (prev__cctx != next->cctx)) 1508 next->cctx = 0;
1509
1510 if (expect_false (cctx_prev != cctx_current))
1386 { 1511 {
1387 prev__cctx->top_env = PL_top_env; 1512 cctx_prev->top_env = PL_top_env;
1388 PL_top_env = next->cctx->top_env; 1513 PL_top_env = cctx_current->top_env;
1389 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1514 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1390 } 1515 }
1391 1516
1392 transfer_tail (aTHX); 1517 transfer_tail (aTHX);
1393 } 1518 }
1394} 1519}
… …
1402coro_state_destroy (pTHX_ struct coro *coro) 1527coro_state_destroy (pTHX_ struct coro *coro)
1403{ 1528{
1404 if (coro->flags & CF_DESTROYED) 1529 if (coro->flags & CF_DESTROYED)
1405 return 0; 1530 return 0;
1406 1531
1407 if (coro->on_destroy) 1532 if (coro->on_destroy && !PL_dirty)
1408 coro->on_destroy (aTHX_ coro); 1533 coro->on_destroy (aTHX_ coro);
1409 1534
1410 coro->flags |= CF_DESTROYED; 1535 coro->flags |= CF_DESTROYED;
1411 1536
1412 if (coro->flags & CF_READY) 1537 if (coro->flags & CF_READY)
… …
1416 --coro_nready; 1541 --coro_nready;
1417 } 1542 }
1418 else 1543 else
1419 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1544 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1420 1545
1421 if (coro->mainstack && coro->mainstack != main_mainstack) 1546 if (coro->mainstack
1422 { 1547 && coro->mainstack != main_mainstack
1423 struct coro temp; 1548 && coro->slot
1424 1549 && !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); 1550 coro_destruct_perl (aTHX_ coro);
1431
1432 load_perl (aTHX_ &temp);
1433
1434 coro->slot = 0;
1435 }
1436 1551
1437 cctx_destroy (coro->cctx); 1552 cctx_destroy (coro->cctx);
1553 SvREFCNT_dec (coro->startcv);
1438 SvREFCNT_dec (coro->args); 1554 SvREFCNT_dec (coro->args);
1555 SvREFCNT_dec (CORO_THROW);
1439 1556
1440 if (coro->next) coro->next->prev = coro->prev; 1557 if (coro->next) coro->next->prev = coro->prev;
1441 if (coro->prev) coro->prev->next = coro->next; 1558 if (coro->prev) coro->prev->next = coro->next;
1442 if (coro == coro_first) coro_first = coro->next; 1559 if (coro == coro_first) coro_first = coro->next;
1443 1560
… …
1502/** Coro ********************************************************************/ 1619/** Coro ********************************************************************/
1503 1620
1504INLINE void 1621INLINE void
1505coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1506{ 1623{
1507 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1508}
1509 1625
1510INLINE SV * 1626 SvREFCNT_inc_NN (coro->hv);
1627
1628 coro->next_ready = 0;
1629 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1630 ready [1] = coro;
1631}
1632
1633INLINE struct coro *
1511coro_deq (pTHX) 1634coro_deq (pTHX)
1512{ 1635{
1513 int prio; 1636 int prio;
1514 1637
1515 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1516 if (AvFILLp (coro_ready [prio]) >= 0) 1639 {
1517 return av_shift (coro_ready [prio]); 1640 struct coro **ready = coro_ready [prio];
1641
1642 if (ready [0])
1643 {
1644 struct coro *coro = ready [0];
1645 ready [0] = coro->next_ready;
1646 return coro;
1647 }
1648 }
1518 1649
1519 return 0; 1650 return 0;
1520} 1651}
1521 1652
1522static int 1653static int
… …
1524{ 1655{
1525 struct coro *coro; 1656 struct coro *coro;
1526 SV *sv_hook; 1657 SV *sv_hook;
1527 void (*xs_hook)(void); 1658 void (*xs_hook)(void);
1528 1659
1529 if (SvROK (coro_sv))
1530 coro_sv = SvRV (coro_sv);
1531
1532 coro = SvSTATE (coro_sv); 1660 coro = SvSTATE (coro_sv);
1533 1661
1534 if (coro->flags & CF_READY) 1662 if (coro->flags & CF_READY)
1535 return 0; 1663 return 0;
1536 1664
… …
1567api_is_ready (pTHX_ SV *coro_sv) 1695api_is_ready (pTHX_ SV *coro_sv)
1568{ 1696{
1569 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1697 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1570} 1698}
1571 1699
1700/* expects to own a reference to next->hv */
1572INLINE void 1701INLINE void
1573prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1702prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1574{ 1703{
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); 1704 SV *prev_sv = SvRV (coro_current);
1705
1614 ta->prev = SvSTATE_hv (prev_sv); 1706 ta->prev = SvSTATE_hv (prev_sv);
1707 ta->next = next;
1708
1615 TRANSFER_CHECK (*ta); 1709 TRANSFER_CHECK (*ta);
1616 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1710
1617 ta->next->flags &= ~CF_READY;
1618 SvRV_set (coro_current, next_sv); 1711 SvRV_set (coro_current, (SV *)next->hv);
1619 1712
1620 free_coro_mortal (aTHX); 1713 free_coro_mortal (aTHX);
1621 coro_mortal = prev_sv; 1714 coro_mortal = prev_sv;
1622} 1715}
1623 1716
1717static void
1718prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1719{
1720 for (;;)
1721 {
1722 struct coro *next = coro_deq (aTHX);
1723
1724 if (expect_true (next))
1725 {
1726 /* cannot transfer to destroyed coros, skip and look for next */
1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1729 else
1730 {
1731 next->flags &= ~CF_READY;
1732 --coro_nready;
1733
1734 prepare_schedule_to (aTHX_ ta, next);
1735 break;
1736 }
1737 }
1738 else
1739 {
1740 /* nothing to schedule: call the idle handler */
1741 if (SvROK (sv_idle)
1742 && SvOBJECT (SvRV (sv_idle)))
1743 {
1744 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1745 api_ready (aTHX_ SvRV (sv_idle));
1746 --coro_nready;
1747 }
1748 else
1749 {
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (sv_idle, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1761 }
1762 }
1763 }
1764}
1765
1624INLINE void 1766INLINE void
1625prepare_cede (pTHX_ struct coro_transfer_args *ta) 1767prepare_cede (pTHX_ struct coro_transfer_args *ta)
1626{ 1768{
1627 api_ready (aTHX_ coro_current); 1769 api_ready (aTHX_ coro_current);
1628 prepare_schedule (aTHX_ ta); 1770 prepare_schedule (aTHX_ ta);
… …
1647{ 1789{
1648 struct coro_transfer_args ta; 1790 struct coro_transfer_args ta;
1649 1791
1650 prepare_schedule (aTHX_ &ta); 1792 prepare_schedule (aTHX_ &ta);
1651 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1794}
1795
1796static void
1797api_schedule_to (pTHX_ SV *coro_sv)
1798{
1799 struct coro_transfer_args ta;
1800 struct coro *next = SvSTATE (coro_sv);
1801
1802 SvREFCNT_inc_NN (coro_sv);
1803 prepare_schedule_to (aTHX_ &ta, next);
1652} 1804}
1653 1805
1654static int 1806static int
1655api_cede (pTHX) 1807api_cede (pTHX)
1656{ 1808{
… …
1685static void 1837static void
1686api_trace (pTHX_ SV *coro_sv, int flags) 1838api_trace (pTHX_ SV *coro_sv, int flags)
1687{ 1839{
1688 struct coro *coro = SvSTATE (coro_sv); 1840 struct coro *coro = SvSTATE (coro_sv);
1689 1841
1842 if (coro->flags & CF_RUNNING)
1843 croak ("cannot enable tracing on a running coroutine, caught");
1844
1690 if (flags & CC_TRACE) 1845 if (flags & CC_TRACE)
1691 { 1846 {
1692 if (!coro->cctx) 1847 if (!coro->cctx)
1693 coro->cctx = cctx_new_run (); 1848 coro->cctx = cctx_new_run ();
1694 else if (!(coro->cctx->flags & CC_TRACE)) 1849 else if (!(coro->cctx->flags & CC_TRACE))
1695 croak ("cannot enable tracing on coroutine with custom stack,"); 1850 croak ("cannot enable tracing on coroutine with custom stack, caught");
1696 1851
1697 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1852 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1698 } 1853 }
1699 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1854 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1700 { 1855 {
… …
1703 if (coro->flags & CF_RUNNING) 1858 if (coro->flags & CF_RUNNING)
1704 PL_runops = RUNOPS_DEFAULT; 1859 PL_runops = RUNOPS_DEFAULT;
1705 else 1860 else
1706 coro->slot->runops = RUNOPS_DEFAULT; 1861 coro->slot->runops = RUNOPS_DEFAULT;
1707 } 1862 }
1863}
1864
1865static void
1866coro_call_on_destroy (pTHX_ struct coro *coro)
1867{
1868 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1869 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1870
1871 if (on_destroyp)
1872 {
1873 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1874
1875 while (AvFILLp (on_destroy) >= 0)
1876 {
1877 dSP; /* don't disturb outer sp */
1878 SV *cb = av_pop (on_destroy);
1879
1880 PUSHMARK (SP);
1881
1882 if (statusp)
1883 {
1884 int i;
1885 AV *status = (AV *)SvRV (*statusp);
1886 EXTEND (SP, AvFILLp (status) + 1);
1887
1888 for (i = 0; i <= AvFILLp (status); ++i)
1889 PUSHs (AvARRAY (status)[i]);
1890 }
1891
1892 PUTBACK;
1893 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1894 }
1895 }
1896}
1897
1898static void
1899slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1900{
1901 int i;
1902 HV *hv = (HV *)SvRV (coro_current);
1903 AV *av = newAV ();
1904
1905 av_extend (av, items - 1);
1906 for (i = 0; i < items; ++i)
1907 av_push (av, SvREFCNT_inc_NN (arg [i]));
1908
1909 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1910
1911 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1912 api_ready (aTHX_ sv_manager);
1913
1914 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_repeat;
1916
1917 /* as a minor optimisation, we could unwind all stacks here */
1918 /* but that puts extra pressure on pp_slf, and is not worth much */
1919 /*coro_unwind_stacks (aTHX);*/
1920}
1921
1922/*****************************************************************************/
1923/* async pool handler */
1924
1925static int
1926slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1927{
1928 HV *hv = (HV *)SvRV (coro_current);
1929 struct coro *coro = (struct coro *)frame->data;
1930
1931 if (!coro->invoke_cb)
1932 return 1; /* loop till we have invoke */
1933 else
1934 {
1935 hv_store (hv, "desc", sizeof ("desc") - 1,
1936 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1937
1938 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1939
1940 {
1941 dSP;
1942 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1943 PUTBACK;
1944 }
1945
1946 SvREFCNT_dec (GvAV (PL_defgv));
1947 GvAV (PL_defgv) = coro->invoke_av;
1948 coro->invoke_av = 0;
1949
1950 return 0;
1951 }
1952}
1953
1954static void
1955slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1956{
1957 HV *hv = (HV *)SvRV (coro_current);
1958 struct coro *coro = SvSTATE_hv ((SV *)hv);
1959
1960 if (expect_true (coro->saved_deffh))
1961 {
1962 /* subsequent iteration */
1963 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1964 coro->saved_deffh = 0;
1965
1966 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1967 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1968 {
1969 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1970 coro->invoke_av = newAV ();
1971
1972 frame->prepare = prepare_nop;
1973 }
1974 else
1975 {
1976 av_clear (GvAV (PL_defgv));
1977 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1978
1979 coro->prio = 0;
1980
1981 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1982 api_trace (aTHX_ coro_current, 0);
1983
1984 frame->prepare = prepare_schedule;
1985 av_push (av_async_pool, SvREFCNT_inc (hv));
1986 }
1987 }
1988 else
1989 {
1990 /* first iteration, simply fall through */
1991 frame->prepare = prepare_nop;
1992 }
1993
1994 frame->check = slf_check_pool_handler;
1995 frame->data = (void *)coro;
1996}
1997
1998/*****************************************************************************/
1999/* rouse callback */
2000
2001#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2002
2003static void
2004coro_rouse_callback (pTHX_ CV *cv)
2005{
2006 dXSARGS;
2007 SV *data = (SV *)S_GENSUB_ARG;
2008
2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2010 {
2011 /* first call, set args */
2012 SV *coro = SvRV (data);
2013 AV *av = newAV ();
2014
2015 SvRV_set (data, (SV *)av);
2016
2017 /* better take a full copy of the arguments */
2018 while (items--)
2019 av_store (av, items, newSVsv (ST (items)));
2020
2021 api_ready (aTHX_ coro);
2022 SvREFCNT_dec (coro);
2023 }
2024
2025 XSRETURN_EMPTY;
2026}
2027
2028static int
2029slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2030{
2031 SV *data = (SV *)frame->data;
2032
2033 if (CORO_THROW)
2034 return 0;
2035
2036 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2037 return 1;
2038
2039 /* now push all results on the stack */
2040 {
2041 dSP;
2042 AV *av = (AV *)SvRV (data);
2043 int i;
2044
2045 EXTEND (SP, AvFILLp (av) + 1);
2046 for (i = 0; i <= AvFILLp (av); ++i)
2047 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2048
2049 /* we have stolen the elements, so set length to zero and free */
2050 AvFILLp (av) = -1;
2051 av_undef (av);
2052
2053 PUTBACK;
2054 }
2055
2056 return 0;
2057}
2058
2059static void
2060slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2061{
2062 SV *cb;
2063
2064 if (items)
2065 cb = arg [0];
2066 else
2067 {
2068 struct coro *coro = SvSTATE_current;
2069
2070 if (!coro->rouse_cb)
2071 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2072
2073 cb = sv_2mortal (coro->rouse_cb);
2074 coro->rouse_cb = 0;
2075 }
2076
2077 if (!SvROK (cb)
2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2080 croak ("Coro::rouse_wait called with illegal callback argument,");
2081
2082 {
2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2084 SV *data = (SV *)S_GENSUB_ARG;
2085
2086 frame->data = (void *)data;
2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2088 frame->check = slf_check_rouse_wait;
2089 }
2090}
2091
2092static SV *
2093coro_new_rouse_cb (pTHX)
2094{
2095 HV *hv = (HV *)SvRV (coro_current);
2096 struct coro *coro = SvSTATE_hv (hv);
2097 SV *data = newRV_inc ((SV *)hv);
2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2099
2100 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2101 SvREFCNT_dec (data); /* magicext increases the refcount */
2102
2103 SvREFCNT_dec (coro->rouse_cb);
2104 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2105
2106 return cb;
1708} 2107}
1709 2108
1710/*****************************************************************************/ 2109/*****************************************************************************/
1711/* schedule-like-function opcode (SLF) */ 2110/* schedule-like-function opcode (SLF) */
1712 2111
… …
1759static void 2158static void
1760slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2159slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1761{ 2160{
1762 frame->prepare = prepare_schedule; 2161 frame->prepare = prepare_schedule;
1763 frame->check = slf_check_nop; 2162 frame->check = slf_check_nop;
2163}
2164
2165static void
2166slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2167{
2168 struct coro *next = (struct coro *)slf_frame.data;
2169
2170 SvREFCNT_inc_NN (next->hv);
2171 prepare_schedule_to (aTHX_ ta, next);
2172}
2173
2174static void
2175slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 if (!items)
2178 croak ("Coro::schedule_to expects a coroutine argument, caught");
2179
2180 frame->data = (void *)SvSTATE (arg [0]);
2181 frame->prepare = slf_prepare_schedule_to;
2182 frame->check = slf_check_nop;
2183}
2184
2185static void
2186slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 api_ready (aTHX_ SvRV (coro_current));
2189
2190 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1764} 2191}
1765 2192
1766static void 2193static void
1767slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2194slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1768{ 2195{
… …
1840 while (slf_frame.check (aTHX_ &slf_frame)); 2267 while (slf_frame.check (aTHX_ &slf_frame));
1841 2268
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2269 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843 2270
1844 /* exception handling */ 2271 /* exception handling */
1845 if (expect_false (coro_throw)) 2272 if (expect_false (CORO_THROW))
1846 { 2273 {
1847 SV *exception = sv_2mortal (coro_throw); 2274 SV *exception = sv_2mortal (CORO_THROW);
1848 2275
1849 coro_throw = 0; 2276 CORO_THROW = 0;
1850 sv_setsv (ERRSV, exception); 2277 sv_setsv (ERRSV, exception);
1851 croak (0); 2278 croak (0);
1852 } 2279 }
1853 2280
1854 /* return value handling - mostly like entersub */ 2281 /* return value handling - mostly like entersub */
… …
1914 } 2341 }
1915 else 2342 else
1916 slf_argc = 0; 2343 slf_argc = 0;
1917 2344
1918 PL_op->op_ppaddr = pp_slf; 2345 PL_op->op_ppaddr = pp_slf;
1919 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2346 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1920 2347
1921 PL_op = (OP *)&slf_restore; 2348 PL_op = (OP *)&slf_restore;
2349}
2350
2351/*****************************************************************************/
2352/* dynamic wind */
2353
2354static void
2355on_enterleave_call (pTHX_ SV *cb)
2356{
2357 dSP;
2358
2359 PUSHSTACK;
2360
2361 PUSHMARK (SP);
2362 PUTBACK;
2363 call_sv (cb, G_VOID | G_DISCARD);
2364 SPAGAIN;
2365
2366 POPSTACK;
2367}
2368
2369static SV *
2370coro_avp_pop_and_free (pTHX_ AV **avp)
2371{
2372 AV *av = *avp;
2373 SV *res = av_pop (av);
2374
2375 if (AvFILLp (av) < 0)
2376 {
2377 *avp = 0;
2378 SvREFCNT_dec (av);
2379 }
2380
2381 return res;
2382}
2383
2384static void
2385coro_pop_on_enter (pTHX_ void *coro)
2386{
2387 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2388 SvREFCNT_dec (cb);
2389}
2390
2391static void
2392coro_pop_on_leave (pTHX_ void *coro)
2393{
2394 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2395 on_enterleave_call (aTHX_ sv_2mortal (cb));
1922} 2396}
1923 2397
1924/*****************************************************************************/ 2398/*****************************************************************************/
1925/* PerlIO::cede */ 2399/* PerlIO::cede */
1926 2400
… …
1995 PerlIOBuf_get_cnt, 2469 PerlIOBuf_get_cnt,
1996 PerlIOBuf_set_ptrcnt, 2470 PerlIOBuf_set_ptrcnt,
1997}; 2471};
1998 2472
1999/*****************************************************************************/ 2473/*****************************************************************************/
2474/* Coro::Semaphore & Coro::Signal */
2475
2476static SV *
2477coro_waitarray_new (pTHX_ int count)
2478{
2479 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2480 AV *av = newAV ();
2481 SV **ary;
2482
2483 /* unfortunately, building manually saves memory */
2484 Newx (ary, 2, SV *);
2485 AvALLOC (av) = ary;
2486#if PERL_VERSION_ATLEAST (5,10,0)
2487 AvARRAY (av) = ary;
2488#else
2489 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2490 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2491 SvPVX ((SV *)av) = (char *)ary;
2492#endif
2493 AvMAX (av) = 1;
2494 AvFILLp (av) = 0;
2495 ary [0] = newSViv (count);
2496
2497 return newRV_noinc ((SV *)av);
2498}
2499
2000/* Coro::Semaphore */ 2500/* semaphore */
2001 2501
2002static void 2502static void
2003coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2503coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2004{ 2504{
2005 SV *count_sv = AvARRAY (av)[0]; 2505 SV *count_sv = AvARRAY (av)[0];
… …
2017 AvARRAY (av)[0] = AvARRAY (av)[1]; 2517 AvARRAY (av)[0] = AvARRAY (av)[1];
2018 AvARRAY (av)[1] = count_sv; 2518 AvARRAY (av)[1] = count_sv;
2019 cb = av_shift (av); 2519 cb = av_shift (av);
2020 2520
2021 if (SvOBJECT (cb)) 2521 if (SvOBJECT (cb))
2522 {
2022 api_ready (aTHX_ cb); 2523 api_ready (aTHX_ cb);
2023 else 2524 --count;
2024 croak ("callbacks not yet supported"); 2525 }
2526 else if (SvTYPE (cb) == SVt_PVCV)
2527 {
2528 dSP;
2529 PUSHMARK (SP);
2530 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2531 PUTBACK;
2532 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2533 }
2025 2534
2026 SvREFCNT_dec (cb); 2535 SvREFCNT_dec (cb);
2027
2028 --count;
2029 } 2536 }
2030} 2537}
2031 2538
2032static void 2539static void
2033coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2540coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2035 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2542 /* call $sem->adjust (0) to possibly wake up some other waiters */
2036 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2543 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2037} 2544}
2038 2545
2039static int 2546static int
2040slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2547slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2041{ 2548{
2042 AV *av = (AV *)frame->data; 2549 AV *av = (AV *)frame->data;
2043 SV *count_sv = AvARRAY (av)[0]; 2550 SV *count_sv = AvARRAY (av)[0];
2044 2551
2045 /* if we are about to throw, don't actually acquire the lock, just throw */ 2552 /* if we are about to throw, don't actually acquire the lock, just throw */
2046 if (coro_throw) 2553 if (CORO_THROW)
2047 return 0; 2554 return 0;
2048 else if (SvIVX (count_sv) > 0) 2555 else if (SvIVX (count_sv) > 0)
2049 { 2556 {
2050 SvSTATE_current->on_destroy = 0; 2557 SvSTATE_current->on_destroy = 0;
2558
2559 if (acquire)
2051 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2560 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2561 else
2562 coro_semaphore_adjust (aTHX_ av, 0);
2563
2052 return 0; 2564 return 0;
2053 } 2565 }
2054 else 2566 else
2055 { 2567 {
2056 int i; 2568 int i;
… …
2065 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2577 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2066 return 1; 2578 return 1;
2067 } 2579 }
2068} 2580}
2069 2581
2070static void 2582static int
2583slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2584{
2585 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2586}
2587
2588static int
2589slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2590{
2591 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2592}
2593
2594static void
2071slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2595slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2072{ 2596{
2073 AV *av = (AV *)SvRV (arg [0]); 2597 AV *av = (AV *)SvRV (arg [0]);
2074 2598
2075 if (SvIVX (AvARRAY (av)[0]) > 0) 2599 if (SvIVX (AvARRAY (av)[0]) > 0)
2076 { 2600 {
… …
2086 2610
2087 /* to avoid race conditions when a woken-up coro gets terminated */ 2611 /* to avoid race conditions when a woken-up coro gets terminated */
2088 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2612 /* we arrange for a temporary on_destroy that calls adjust (0) */
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2613 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 } 2614 }
2615}
2091 2616
2617static void
2618slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2619{
2620 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2092 frame->check = slf_check_semaphore_down; 2621 frame->check = slf_check_semaphore_down;
2093
2094} 2622}
2095 2623
2096/*****************************************************************************/ 2624static void
2097/* gensub: simple closure generation utility */ 2625slf_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{ 2626{
2107 CV *cv = (CV *)newSV (0); 2627 if (items >= 2)
2628 {
2629 /* callback form */
2630 AV *av = (AV *)SvRV (arg [0]);
2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2108 2632
2109 sv_upgrade ((SV *)cv, SVt_PVCV); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2110 2634
2111 CvANON_on (cv); 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2112 CvISXSUB_on (cv); 2636 coro_semaphore_adjust (aTHX_ av, 0);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115 2637
2116 return newRV_noinc ((SV *)cv); 2638 frame->prepare = prepare_nop;
2639 frame->check = slf_check_nop;
2640 }
2641 else
2642 {
2643 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2644 frame->check = slf_check_semaphore_wait;
2645 }
2646}
2647
2648/* signal */
2649
2650static void
2651coro_signal_wake (pTHX_ AV *av, int count)
2652{
2653 SvIVX (AvARRAY (av)[0]) = 0;
2654
2655 /* now signal count waiters */
2656 while (count > 0 && AvFILLp (av) > 0)
2657 {
2658 SV *cb;
2659
2660 /* swap first two elements so we can shift a waiter */
2661 cb = AvARRAY (av)[0];
2662 AvARRAY (av)[0] = AvARRAY (av)[1];
2663 AvARRAY (av)[1] = cb;
2664
2665 cb = av_shift (av);
2666
2667 if (SvTYPE (cb) == SVt_PVCV)
2668 {
2669 dSP;
2670 PUSHMARK (SP);
2671 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2672 PUTBACK;
2673 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2674 }
2675 else
2676 {
2677 api_ready (aTHX_ cb);
2678 sv_setiv (cb, 0); /* signal waiter */
2679 }
2680
2681 SvREFCNT_dec (cb);
2682
2683 --count;
2684 }
2685}
2686
2687static int
2688slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2689{
2690 /* if we are about to throw, also stop waiting */
2691 return SvROK ((SV *)frame->data) && !CORO_THROW;
2692}
2693
2694static void
2695slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2696{
2697 AV *av = (AV *)SvRV (arg [0]);
2698
2699 if (items >= 2)
2700 {
2701 SV *cb_cv = s_get_cv_croak (arg [1]);
2702 av_push (av, SvREFCNT_inc_NN (cb_cv));
2703
2704 if (SvIVX (AvARRAY (av)[0]))
2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2706
2707 frame->prepare = prepare_nop;
2708 frame->check = slf_check_nop;
2709 }
2710 else if (SvIVX (AvARRAY (av)[0]))
2711 {
2712 SvIVX (AvARRAY (av)[0]) = 0;
2713 frame->prepare = prepare_nop;
2714 frame->check = slf_check_nop;
2715 }
2716 else
2717 {
2718 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2719
2720 av_push (av, waiter);
2721
2722 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2723 frame->prepare = prepare_schedule;
2724 frame->check = slf_check_signal_wait;
2725 }
2117} 2726}
2118 2727
2119/*****************************************************************************/ 2728/*****************************************************************************/
2120/* Coro::AIO */ 2729/* Coro::AIO */
2121 2730
… …
2132 2741
2133static void 2742static void
2134coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2135{ 2744{
2136 dXSARGS; 2745 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2138 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2140 2749
2141 av_extend (state, items); 2750 av_extend (state, items - 1);
2142 2751
2143 sv_upgrade (data_sv, SVt_PV); 2752 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state)); 2753 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv); 2754 SvPOK_only (data_sv);
2146 2755
… …
2174 AV *state = (AV *)frame->data; 2783 AV *state = (AV *)frame->data;
2175 2784
2176 /* if we are about to throw, return early */ 2785 /* if we are about to throw, return early */
2177 /* this does not cancel the aio request, but at least */ 2786 /* this does not cancel the aio request, but at least */
2178 /* it quickly returns */ 2787 /* it quickly returns */
2179 if (coro_throw) 2788 if (CORO_THROW)
2180 return 0; 2789 return 0;
2181 2790
2182 /* one element that is an RV? repeat! */ 2791 /* one element that is an RV? repeat! */
2183 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2792 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2184 return 1; 2793 return 1;
… …
2256 2865
2257 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2258 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2259 2868
2260 /* now push the callback closure */ 2869 /* now push the callback closure */
2261 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2870 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2262 2871
2263 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2264 PUTBACK; 2873 PUTBACK;
2265 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2266 } 2875 }
… …
2280 2889
2281 XSRETURN_EMPTY; 2890 XSRETURN_EMPTY;
2282} 2891}
2283 2892
2284/*****************************************************************************/ 2893/*****************************************************************************/
2894
2895#if CORO_CLONE
2896# include "clone.c"
2897#endif
2285 2898
2286MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2899MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2287 2900
2288PROTOTYPES: DISABLE 2901PROTOTYPES: DISABLE
2289 2902
… …
2294 coro_thx = PERL_GET_CONTEXT; 2907 coro_thx = PERL_GET_CONTEXT;
2295# endif 2908# endif
2296#endif 2909#endif
2297 BOOT_PAGESIZE; 2910 BOOT_PAGESIZE;
2298 2911
2912 cctx_current = cctx_new_empty ();
2913
2299 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2914 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2300 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2915 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2301 2916
2302 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2917 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; 2918 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2322 2937
2323 { 2938 {
2324 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2939 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2325 2940
2326 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2941 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2327 hv_store_ent (PL_custom_op_names, slf, 2942 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2328 newSVpv ("coro_slf", 0), 0);
2329 2943
2330 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2944 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2331 hv_store_ent (PL_custom_op_descs, slf, 2945 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2332 newSVpv ("coro schedule like function", 0), 0);
2333 } 2946 }
2334 2947
2335 coroapi.ver = CORO_API_VERSION; 2948 coroapi.ver = CORO_API_VERSION;
2336 coroapi.rev = CORO_API_REVISION; 2949 coroapi.rev = CORO_API_REVISION;
2337 2950
… …
2349 2962
2350 if (!svp) croak ("Time::HiRes is required"); 2963 if (!svp) croak ("Time::HiRes is required");
2351 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2352 2965
2353 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2967
2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2354 } 2970 }
2355 2971
2356 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2357} 2973}
2358 2974
2359SV * 2975SV *
2360new (char *klass, ...) 2976new (char *klass, ...)
2977 ALIAS:
2978 Coro::new = 1
2361 CODE: 2979 CODE:
2362{ 2980{
2363 struct coro *coro; 2981 struct coro *coro;
2364 MAGIC *mg; 2982 MAGIC *mg;
2365 HV *hv; 2983 HV *hv;
2984 SV *cb;
2366 int i; 2985 int i;
2986
2987 if (items > 1)
2988 {
2989 cb = s_get_cv_croak (ST (1));
2990
2991 if (!ix)
2992 {
2993 if (CvISXSUB (cb))
2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2995
2996 if (!CvROOT (cb))
2997 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2998 }
2999 }
2367 3000
2368 Newz (0, coro, 1, struct coro); 3001 Newz (0, coro, 1, struct coro);
2369 coro->args = newAV (); 3002 coro->args = newAV ();
2370 coro->flags = CF_NEW; 3003 coro->flags = CF_NEW;
2371 3004
… …
2376 coro->hv = hv = newHV (); 3009 coro->hv = hv = newHV ();
2377 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3010 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2378 mg->mg_flags |= MGf_DUP; 3011 mg->mg_flags |= MGf_DUP;
2379 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3012 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2380 3013
3014 if (items > 1)
3015 {
2381 av_extend (coro->args, items - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
3017
3018 if (ix)
3019 {
3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3021 cb = (SV *)cv_coro_run;
3022 }
3023
3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3025
2382 for (i = 1; i < items; i++) 3026 for (i = 2; i < items; i++)
2383 av_push (coro->args, newSVsv (ST (i))); 3027 av_push (coro->args, newSVsv (ST (i)));
3028 }
2384} 3029}
2385 OUTPUT: 3030 OUTPUT:
2386 RETVAL 3031 RETVAL
2387 3032
2388void 3033void
… …
2401void 3046void
2402_exit (int code) 3047_exit (int code)
2403 PROTOTYPE: $ 3048 PROTOTYPE: $
2404 CODE: 3049 CODE:
2405 _exit (code); 3050 _exit (code);
3051
3052SV *
3053clone (Coro::State coro)
3054 CODE:
3055{
3056#if CORO_CLONE
3057 struct coro *ncoro = coro_clone (aTHX_ coro);
3058 MAGIC *mg;
3059 /* TODO: too much duplication */
3060 ncoro->hv = newHV ();
3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3062 mg->mg_flags |= MGf_DUP;
3063 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3064#else
3065 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3066#endif
3067}
3068 OUTPUT:
3069 RETVAL
2406 3070
2407int 3071int
2408cctx_stacksize (int new_stacksize = 0) 3072cctx_stacksize (int new_stacksize = 0)
2409 PROTOTYPE: ;$ 3073 PROTOTYPE: ;$
2410 CODE: 3074 CODE:
… …
2460 eval = 1 3124 eval = 1
2461 CODE: 3125 CODE:
2462{ 3126{
2463 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2464 { 3128 {
2465 struct coro temp; 3129 struct coro *current = SvSTATE_current;
2466 3130
2467 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
2468 { 3132 {
2469 PUTBACK; 3133 PUTBACK;
2470 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
2471 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
2472 } 3137 }
2473 3138
2474 {
2475 dSP;
2476 ENTER;
2477 SAVETMPS;
2478 PUTBACK;
2479 PUSHSTACK; 3139 PUSHSTACK;
3140
2480 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
2481 3143
2482 if (ix) 3144 if (ix)
2483 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
2484 else 3146 else
2485 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2486 3148
2487 POPSTACK; 3149 POPSTACK;
2488 SPAGAIN; 3150 SPAGAIN;
2489 FREETMPS;
2490 LEAVE;
2491 PUTBACK;
2492 }
2493 3151
2494 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
2495 { 3153 {
3154 PUTBACK;
2496 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
2497 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
2498 SPAGAIN; 3157 SPAGAIN;
2499 } 3158 }
2500 } 3159 }
2501} 3160}
2502 3161
… …
2506 ALIAS: 3165 ALIAS:
2507 is_ready = CF_READY 3166 is_ready = CF_READY
2508 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
2509 is_new = CF_NEW 3168 is_new = CF_NEW
2510 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
2511 CODE: 3171 CODE:
2512 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
2513 OUTPUT: 3173 OUTPUT:
2514 RETVAL 3174 RETVAL
2515 3175
… …
2517throw (Coro::State self, SV *throw = &PL_sv_undef) 3177throw (Coro::State self, SV *throw = &PL_sv_undef)
2518 PROTOTYPE: $;$ 3178 PROTOTYPE: $;$
2519 CODE: 3179 CODE:
2520{ 3180{
2521 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
2522 SV **throwp = self == current ? &coro_throw : &self->throw; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
2523 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
2524 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2525} 3186}
2526 3187
2527void 3188void
2528api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2531 3192
2532SV * 3193SV *
2533has_cctx (Coro::State coro) 3194has_cctx (Coro::State coro)
2534 PROTOTYPE: $ 3195 PROTOTYPE: $
2535 CODE: 3196 CODE:
2536 RETVAL = boolSV (!!coro->cctx); 3197 /* maybe manage the running flag differently */
3198 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2537 OUTPUT: 3199 OUTPUT:
2538 RETVAL 3200 RETVAL
2539 3201
2540int 3202int
2541is_traced (Coro::State coro) 3203is_traced (Coro::State coro)
… …
2561 3223
2562void 3224void
2563force_cctx () 3225force_cctx ()
2564 PROTOTYPE: 3226 PROTOTYPE:
2565 CODE: 3227 CODE:
2566 SvSTATE_current->cctx->idle_sp = 0; 3228 cctx_current->idle_sp = 0;
2567 3229
2568void 3230void
2569swap_defsv (Coro::State self) 3231swap_defsv (Coro::State self)
2570 PROTOTYPE: $ 3232 PROTOTYPE: $
2571 ALIAS: 3233 ALIAS:
… …
2579 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3241 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2580 3242
2581 SV *tmp = *src; *src = *dst; *dst = tmp; 3243 SV *tmp = *src; *src = *dst; *dst = tmp;
2582 } 3244 }
2583 3245
3246void
3247cancel (Coro::State self)
3248 CODE:
3249 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251
3252
3253SV *
3254enable_times (int enabled = enable_times)
3255 CODE:
3256{
3257 RETVAL = boolSV (enable_times);
3258
3259 if (enabled != enable_times)
3260 {
3261 enable_times = enabled;
3262
3263 coro_times_update ();
3264 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3265 }
3266}
3267 OUTPUT:
3268 RETVAL
3269
3270void
3271times (Coro::State self)
3272 PPCODE:
3273{
3274 struct coro *current = SvSTATE (coro_current);
3275
3276 if (expect_false (current == self))
3277 {
3278 coro_times_update ();
3279 coro_times_add (SvSTATE (coro_current));
3280 }
3281
3282 EXTEND (SP, 2);
3283 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3284 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3285
3286 if (expect_false (current == self))
3287 coro_times_sub (SvSTATE (coro_current));
3288}
2584 3289
2585MODULE = Coro::State PACKAGE = Coro 3290MODULE = Coro::State PACKAGE = Coro
2586 3291
2587BOOT: 3292BOOT:
2588{ 3293{
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); 3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2593 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2594 3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2595 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3298 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2596 SvREADONLY_on (coro_current); 3299 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3300 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3301 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3302 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3303
3304 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3305 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3306 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2597 3308
2598 coro_stash = gv_stashpv ("Coro", TRUE); 3309 coro_stash = gv_stashpv ("Coro", TRUE);
2599 3310
2600 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2601 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2602 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2603 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3314 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2604 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3315 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2605 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3316 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 3317
2610 { 3318 {
2611 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3319 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2612 3320
2613 coroapi.schedule = api_schedule; 3321 coroapi.schedule = api_schedule;
3322 coroapi.schedule_to = api_schedule_to;
2614 coroapi.cede = api_cede; 3323 coroapi.cede = api_cede;
2615 coroapi.cede_notself = api_cede_notself; 3324 coroapi.cede_notself = api_cede_notself;
2616 coroapi.ready = api_ready; 3325 coroapi.ready = api_ready;
2617 coroapi.is_ready = api_is_ready; 3326 coroapi.is_ready = api_is_ready;
2618 coroapi.nready = coro_nready; 3327 coroapi.nready = coro_nready;
2619 coroapi.current = coro_current; 3328 coroapi.current = coro_current;
2620 3329
2621 GCoroAPI = &coroapi; 3330 /*GCoroAPI = &coroapi;*/
2622 sv_setiv (sv, (IV)&coroapi); 3331 sv_setiv (sv, (IV)&coroapi);
2623 SvREADONLY_on (sv); 3332 SvREADONLY_on (sv);
2624 } 3333 }
2625} 3334}
3335
3336void
3337terminate (...)
3338 CODE:
3339 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2626 3340
2627void 3341void
2628schedule (...) 3342schedule (...)
2629 CODE: 3343 CODE:
2630 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3344 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3345
3346void
3347schedule_to (...)
3348 CODE:
3349 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3350
3351void
3352cede_to (...)
3353 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2631 3355
2632void 3356void
2633cede (...) 3357cede (...)
2634 CODE: 3358 CODE:
2635 CORO_EXECUTE_SLF_XS (slf_init_cede); 3359 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2649void 3373void
2650_set_readyhook (SV *hook) 3374_set_readyhook (SV *hook)
2651 PROTOTYPE: $ 3375 PROTOTYPE: $
2652 CODE: 3376 CODE:
2653 SvREFCNT_dec (coro_readyhook); 3377 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook);
2654 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2655 3380
2656int 3381int
2657prio (Coro::State coro, int newprio = 0) 3382prio (Coro::State coro, int newprio = 0)
2658 PROTOTYPE: $;$ 3383 PROTOTYPE: $;$
… …
2665 if (items > 1) 3390 if (items > 1)
2666 { 3391 {
2667 if (ix) 3392 if (ix)
2668 newprio = coro->prio - newprio; 3393 newprio = coro->prio - newprio;
2669 3394
2670 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3395 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2671 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3396 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2672 3397
2673 coro->prio = newprio; 3398 coro->prio = newprio;
2674 } 3399 }
2675} 3400}
2676 OUTPUT: 3401 OUTPUT:
… …
2690 CODE: 3415 CODE:
2691 RETVAL = coro_nready; 3416 RETVAL = coro_nready;
2692 OUTPUT: 3417 OUTPUT:
2693 RETVAL 3418 RETVAL
2694 3419
2695# for async_pool speedup
2696void 3420void
2697_pool_1 (SV *cb) 3421suspend (Coro::State self)
3422 PROTOTYPE: $
2698 CODE: 3423 CODE:
2699{ 3424 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 3425
2707 if (!invoke) 3426void
3427resume (Coro::State self)
3428 PROTOTYPE: $
3429 CODE:
3430 self->flags &= ~CF_SUSPENDED;
3431
3432void
3433_pool_handler (...)
3434 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3436
3437void
3438async_pool (SV *cv, ...)
3439 PROTOTYPE: &@
3440 PPCODE:
3441{
3442 HV *hv = (HV *)av_pop (av_async_pool);
3443 AV *av = newAV ();
3444 SV *cb = ST (0);
3445 int i;
3446
3447 av_extend (av, items - 2);
3448 for (i = 1; i < items; ++i)
3449 av_push (av, SvREFCNT_inc_NN (ST (i)));
3450
3451 if ((SV *)hv == &PL_sv_undef)
2708 { 3452 {
2709 SV *old = PL_diehook; 3453 PUSHMARK (SP);
2710 PL_diehook = 0; 3454 EXTEND (SP, 2);
2711 SvREFCNT_dec (old); 3455 PUSHs (sv_Coro);
2712 croak ("\3async_pool terminate\2\n"); 3456 PUSHs ((SV *)cv_pool_handler);
3457 PUTBACK;
3458 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3459 SPAGAIN;
3460
3461 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2713 } 3462 }
2714 3463
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 { 3464 {
2728 av_fill (defav, len - 1); 3465 struct coro *coro = SvSTATE_hv (hv);
2729 for (i = 0; i < len; ++i) 3466
2730 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3467 assert (!coro->invoke_cb);
3468 assert (!coro->invoke_av);
3469 coro->invoke_cb = SvREFCNT_inc (cb);
3470 coro->invoke_av = av;
2731 } 3471 }
3472
3473 api_ready (aTHX_ (SV *)hv);
3474
3475 if (GIMME_V != G_VOID)
3476 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3477 else
3478 SvREFCNT_dec (hv);
2732} 3479}
3480
3481SV *
3482rouse_cb ()
3483 PROTOTYPE:
3484 CODE:
3485 RETVAL = coro_new_rouse_cb (aTHX);
3486 OUTPUT:
3487 RETVAL
2733 3488
2734void 3489void
2735_pool_2 (SV *cb) 3490rouse_wait (...)
3491 PROTOTYPE: ;$
3492 PPCODE:
3493 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3494
3495void
3496on_enter (SV *block)
3497 ALIAS:
3498 on_leave = 1
3499 PROTOTYPE: &
2736 CODE: 3500 CODE:
2737{ 3501{
2738 HV *hv = (HV *)SvRV (coro_current);
2739 struct coro *coro = SvSTATE_hv ((SV *)hv); 3502 struct coro *coro = SvSTATE_current;
3503 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2740 3504
2741 sv_setsv (cb, &PL_sv_undef); 3505 block = s_get_cv_croak (block);
2742 3506
2743 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3507 if (!*avp)
2744 coro->saved_deffh = 0; 3508 *avp = newAV ();
2745 3509
2746 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3510 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 3511
2755 av_clear (GvAV (PL_defgv)); 3512 if (!ix)
2756 hv_store (hv, "desc", sizeof ("desc") - 1, 3513 on_enterleave_call (aTHX_ block);
2757 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2758 3514
2759 coro->prio = 0; 3515 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2760 3516 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2761 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3517 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} 3518}
2766 3519
2767 3520
2768MODULE = Coro::State PACKAGE = PerlIO::cede 3521MODULE = Coro::State PACKAGE = PerlIO::cede
2769 3522
… …
2772 3525
2773 3526
2774MODULE = Coro::State PACKAGE = Coro::Semaphore 3527MODULE = Coro::State PACKAGE = Coro::Semaphore
2775 3528
2776SV * 3529SV *
2777new (SV *klass, SV *count_ = 0) 3530new (SV *klass, SV *count = 0)
2778 CODE: 3531 CODE:
2779{ 3532{
2780 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3533 int semcnt = 1;
2781 AV *av = newAV ();
2782 SV **ary;
2783 3534
2784 /* unfortunately, building manually saves memory */ 3535 if (count)
2785 Newx (ary, 2, SV *); 3536 {
2786 AvALLOC (av) = ary; 3537 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 3538
2792 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3539 if (SvOK (count))
3540 semcnt = SvIV (count);
3541 }
3542
3543 RETVAL = sv_bless (
3544 coro_waitarray_new (aTHX_ semcnt),
3545 GvSTASH (CvGV (cv))
3546 );
2793} 3547}
3548 OUTPUT:
3549 RETVAL
3550
3551# helper for Coro::Channel and others
3552SV *
3553_alloc (int count)
3554 CODE:
3555 RETVAL = coro_waitarray_new (aTHX_ count);
2794 OUTPUT: 3556 OUTPUT:
2795 RETVAL 3557 RETVAL
2796 3558
2797SV * 3559SV *
2798count (SV *self) 3560count (SV *self)
… …
2807 adjust = 1 3569 adjust = 1
2808 CODE: 3570 CODE:
2809 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3571 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2810 3572
2811void 3573void
2812down (SV *self) 3574down (...)
2813 CODE: 3575 CODE:
2814 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3576 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3577
3578void
3579wait (...)
3580 CODE:
3581 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2815 3582
2816void 3583void
2817try (SV *self) 3584try (SV *self)
2818 PPCODE: 3585 PPCODE:
2819{ 3586{
… …
2831 XSRETURN_NO; 3598 XSRETURN_NO;
2832} 3599}
2833 3600
2834void 3601void
2835waiters (SV *self) 3602waiters (SV *self)
2836 CODE: 3603 PPCODE:
2837{ 3604{
2838 AV *av = (AV *)SvRV (self); 3605 AV *av = (AV *)SvRV (self);
3606 int wcount = AvFILLp (av) + 1 - 1;
2839 3607
2840 if (GIMME_V == G_SCALAR) 3608 if (GIMME_V == G_SCALAR)
2841 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3609 XPUSHs (sv_2mortal (newSViv (wcount)));
2842 else 3610 else
2843 { 3611 {
2844 int i; 3612 int i;
2845 EXTEND (SP, AvFILLp (av) + 1 - 1); 3613 EXTEND (SP, wcount);
2846 for (i = 1; i <= AvFILLp (av); ++i) 3614 for (i = 1; i <= wcount; ++i)
2847 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3615 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2848 } 3616 }
2849} 3617}
3618
3619MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3620
3621void
3622_may_delete (SV *sem, int count, int extra_refs)
3623 PPCODE:
3624{
3625 AV *av = (AV *)SvRV (sem);
3626
3627 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3628 && AvFILLp (av) == 0 /* no waiters, just count */
3629 && SvIV (AvARRAY (av)[0]) == count)
3630 XSRETURN_YES;
3631
3632 XSRETURN_NO;
3633}
3634
3635MODULE = Coro::State PACKAGE = Coro::Signal
3636
3637SV *
3638new (SV *klass)
3639 CODE:
3640 RETVAL = sv_bless (
3641 coro_waitarray_new (aTHX_ 0),
3642 GvSTASH (CvGV (cv))
3643 );
3644 OUTPUT:
3645 RETVAL
3646
3647void
3648wait (...)
3649 CODE:
3650 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3651
3652void
3653broadcast (SV *self)
3654 CODE:
3655{
3656 AV *av = (AV *)SvRV (self);
3657 coro_signal_wake (aTHX_ av, AvFILLp (av));
3658}
3659
3660void
3661send (SV *self)
3662 CODE:
3663{
3664 AV *av = (AV *)SvRV (self);
3665
3666 if (AvFILLp (av))
3667 coro_signal_wake (aTHX_ av, 1);
3668 else
3669 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3670}
3671
3672IV
3673awaited (SV *self)
3674 CODE:
3675 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3676 OUTPUT:
3677 RETVAL
2850 3678
2851 3679
2852MODULE = Coro::State PACKAGE = Coro::AnyEvent 3680MODULE = Coro::State PACKAGE = Coro::AnyEvent
2853 3681
2854BOOT: 3682BOOT:
… …
2882 3710
2883void 3711void
2884_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
2885 CODE: 3713 CODE:
2886{ 3714{
2887 HV *st; 3715 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 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
2891 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2892 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
2893 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2894} 3720}

Diff Legend

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