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

Diff Legend

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