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.311 by root, Thu Nov 20 01:12:08 2008 UTC vs.
Revision 1.371 by root, Sat Aug 22 22:36:23 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
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
… …
240 217
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;
222
223 /* ready queue */
224 struct coro *next_ready;
245 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 */
… …
263 SV *except; /* exception to be thrown */ 243 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 244 SV *rouse_cb;
265 245
266 /* async_pool */ 246 /* async_pool */
267 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;
268 257
269 /* linked list */ 258 /* linked list */
270 struct coro *next, *prev; 259 struct coro *next, *prev;
271}; 260};
272 261
… …
278/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
280 269
281/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
282 271
283#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
289 278
290/* for Coro.pm */ 279/* for Coro.pm */
291static SV *coro_current; 280static SV *coro_current;
292static SV *coro_readyhook; 281static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
294static CV *cv_coro_run; 283static CV *cv_coro_run, *cv_coro_terminate;
295static struct coro *coro_first; 284static struct coro *coro_first;
296#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
297 306
298/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
299 308
300static SV * 309static SV *
301coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
… …
325 get_hv (name, create); 334 get_hv (name, create);
326#endif 335#endif
327 return get_hv (name, create); 336 return get_hv (name, create);
328} 337}
329 338
330/* may croak */ 339INLINE void
331INLINE CV * 340coro_times_update ()
332coro_sv_2cv (pTHX_ SV *sv)
333{ 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{
334 HV *st; 408 HV *stash;
335 GV *gvp; 409 MAGIC *mg;
336 return sv_2cv (sv, &st, &gvp, 0); 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;
337} 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 */
338 437
339static AV * 438static AV *
340coro_clone_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
341{ 440{
342 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
343 AV *newpadlist, *newpad; 442 AV *newpadlist, *newpad;
344 443
345 newpadlist = newAV (); 444 newpadlist = newAV ();
… …
350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
351#endif 450#endif
352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
353 --AvFILLp (padlist); 452 --AvFILLp (padlist);
354 453
355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
356 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
357 456
358 return newpadlist; 457 return newpadlist;
359} 458}
360 459
361static void 460static void
362free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
363{ 462{
364 /* may be during global destruction */ 463 /* may be during global destruction */
365 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
366 { 465 {
367 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
368 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
369 { 469 {
370 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
371 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
372 { 472 I32 j = AvFILLp (av);
373 SV *sv; 473
374 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
375 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
376
377 SvREFCNT_dec (*svp);
378 }
379 } 479 }
380 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
381 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
382 } 485 }
383} 486}
384 487
385static int 488static int
386coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
387{ 490{
388 AV *padlist; 491 AV *padlist;
389 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;
390 497
391 /* casting is fun. */ 498 /* casting is fun. */
392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
393 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
394 501
395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
396 503
397 return 0; 504 return 0;
398} 505}
399
400#define CORO_MAGIC_type_cv 26
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
402 506
403static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0, 508 0, 0, 0, 0,
405 coro_cv_free 509 coro_cv_free
406}; 510};
407
408#define CORO_MAGIC_NN(sv, type) \
409 (expect_true (SvMAGIC (sv)->mg_type == type) \
410 ? SvMAGIC (sv) \
411 : mg_find (sv, type))
412
413#define CORO_MAGIC(sv, type) \
414 (expect_true (SvMAGIC (sv)) \
415 ? CORO_MAGIC_NN (sv, type) \
416 : 0)
417
418#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
419#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
420
421INLINE struct coro *
422SvSTATE_ (pTHX_ SV *coro)
423{
424 HV *stash;
425 MAGIC *mg;
426
427 if (SvROK (coro))
428 coro = SvRV (coro);
429
430 if (expect_false (SvTYPE (coro) != SVt_PVHV))
431 croak ("Coro::State object required");
432
433 stash = SvSTASH (coro);
434 if (expect_false (stash != coro_stash && stash != coro_state_stash))
435 {
436 /* very slow, but rare, check */
437 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
438 croak ("Coro::State object required");
439 }
440
441 mg = CORO_MAGIC_state (coro);
442 return (struct coro *)mg->mg_ptr;
443}
444
445#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
446
447/* faster than SvSTATE, but expects a coroutine hv */
448#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
449#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
450 511
451/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
452static void 513static void
453get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
454{ 515{
… …
465 CV *cp = Perl_cv_clone (aTHX_ cv); 526 CV *cp = Perl_cv_clone (aTHX_ cv);
466 CvPADLIST (cv) = CvPADLIST (cp); 527 CvPADLIST (cv) = CvPADLIST (cp);
467 CvPADLIST (cp) = 0; 528 CvPADLIST (cp) = 0;
468 SvREFCNT_dec (cp); 529 SvREFCNT_dec (cp);
469#else 530#else
470 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
471#endif 532#endif
472 } 533 }
473} 534}
474 535
475static void 536static void
… …
482 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);
483 544
484 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
485 546
486 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
487 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
488 549
489 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
490} 551}
491 552
492/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
493 557
494static void 558static void
495load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
496{ 560{
497 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
498 c->slot = 0; 562 c->slot = 0;
499 563
500 PL_mainstack = c->mainstack; 564 PL_mainstack = c->mainstack;
501 565
502 GvSV (PL_defgv) = slot->defsv; 566 GvSV (PL_defgv) = slot->defsv;
503 GvAV (PL_defgv) = slot->defav; 567 GvAV (PL_defgv) = slot->defav;
504 GvSV (PL_errgv) = slot->errsv; 568 GvSV (PL_errgv) = slot->errsv;
505 GvSV (irsgv) = slot->irsgv; 569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
506 571
507 #define VAR(name,type) PL_ ## name = slot->name; 572 #define VAR(name,type) PL_ ## name = slot->name;
508 # include "state.h" 573 # include "state.h"
509 #undef VAR 574 #undef VAR
510 575
… …
524 PUTBACK; 589 PUTBACK;
525 } 590 }
526 591
527 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
528 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 }
529} 610}
530 611
531static void 612static void
532save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
533{ 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
534 c->except = CORO_THROW; 631 c->except = CORO_THROW;
535 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
536 633
537 { 634 {
538 dSP; 635 dSP;
… …
551 { 648 {
552 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
553 { 650 {
554 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
555 652
556 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))
557 { 654 {
558 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
559 656
560 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
561 { 658 {
… …
585 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
586 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
587 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
588 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
589 { 686 {
590 int i; 687 unsigned int i;
591 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
592 CXINC; 689 CXINC;
593 } 690 }
594 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
595 692
596 c->mainstack = PL_mainstack; 693 c->mainstack = PL_mainstack;
597 694
598 { 695 {
599 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
600 697
601 slot->defav = GvAV (PL_defgv); 698 slot->defav = GvAV (PL_defgv);
602 slot->defsv = DEFSV; 699 slot->defsv = DEFSV;
603 slot->errsv = ERRSV; 700 slot->errsv = ERRSV;
604 slot->irsgv = GvSV (irsgv); 701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
605 703
606 #define VAR(name,type) slot->name = PL_ ## name; 704 #define VAR(name,type) slot->name = PL_ ## name;
607 # include "state.h" 705 # include "state.h"
608 #undef VAR 706 #undef VAR
609 } 707 }
… …
687#if !PERL_VERSION_ATLEAST (5,10,0) 785#if !PERL_VERSION_ATLEAST (5,10,0)
688 Safefree (PL_retstack); 786 Safefree (PL_retstack);
689#endif 787#endif
690} 788}
691 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
692static size_t 799static size_t
693coro_rss (pTHX_ struct coro *coro) 800coro_rss (pTHX_ struct coro *coro)
694{ 801{
695 size_t rss = sizeof (*coro); 802 size_t rss = sizeof (*coro);
696 803
697 if (coro->mainstack) 804 if (coro->mainstack)
698 { 805 {
699 perl_slots tmp_slot;
700 perl_slots *slot;
701
702 if (coro->flags & CF_RUNNING) 806 if (coro->flags & CF_RUNNING)
703 { 807 {
704 slot = &tmp_slot; 808 #define SYM(sym) PL_ ## sym
705 809 CORO_RSS;
706 #define VAR(name,type) slot->name = PL_ ## name;
707 # include "state.h"
708 #undef VAR 810 #undef SYM
709 } 811 }
710 else 812 else
711 slot = coro->slot;
712
713 if (slot)
714 { 813 {
715 rss += sizeof (slot->curstackinfo); 814 #define SYM(sym) coro->slot->sym
716 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 815 CORO_RSS;
717 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 816 #undef SYM
718 rss += slot->tmps_max * sizeof (SV *);
719 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
720 rss += slot->scopestack_max * sizeof (I32);
721 rss += slot->savestack_max * sizeof (ANY);
722
723#if !PERL_VERSION_ATLEAST (5,10,0)
724 rss += slot->retstack_max * sizeof (OP *);
725#endif
726 } 817 }
727 } 818 }
728 819
729 return rss; 820 return rss;
730} 821}
… …
743#endif 834#endif
744 835
745/* 836/*
746 * This overrides the default magic get method of %SIG elements. 837 * This overrides the default magic get method of %SIG elements.
747 * 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
748 * 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
749 * readback here. 840 * readback here.
750 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
751 * not expecting this to actually change the hook. This is a potential problem
752 * when a schedule happens then, but we ignore this.
753 */ 841 */
754static int 842static int
755coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
756{ 844{
757 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
… …
810 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
811 899
812 if (svp) 900 if (svp)
813 { 901 {
814 SV *old = *svp; 902 SV *old = *svp;
815 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
816 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
817 return 0; 905 return 0;
818 } 906 }
819 } 907 }
820 908
… …
830 918
831static int 919static int
832slf_check_nop (pTHX_ struct CoroSLF *frame) 920slf_check_nop (pTHX_ struct CoroSLF *frame)
833{ 921{
834 return 0; 922 return 0;
923}
924
925static int
926slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{
928 return 1;
835} 929}
836 930
837static UNOP coro_setup_op; 931static UNOP coro_setup_op;
838 932
839static 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 */
… …
846 940
847 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
848 PL_curcop = &PL_compiling; 942 PL_curcop = &PL_compiling;
849 PL_in_eval = EVAL_NULL; 943 PL_in_eval = EVAL_NULL;
850 PL_comppad = 0; 944 PL_comppad = 0;
945 PL_comppad_name = 0;
946 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0;
851 PL_curpm = 0; 948 PL_curpm = 0;
852 PL_curpad = 0; 949 PL_curpad = 0;
853 PL_localizing = 0; 950 PL_localizing = 0;
854 PL_dirty = 0; 951 PL_dirty = 0;
855 PL_restartop = 0; 952 PL_restartop = 0;
856#if PERL_VERSION_ATLEAST (5,10,0) 953#if PERL_VERSION_ATLEAST (5,10,0)
857 PL_parser = 0; 954 PL_parser = 0;
858#endif 955#endif
956 PL_hints = 0;
859 957
860 /* recreate the die/warn hooks */ 958 /* recreate the die/warn hooks */
861 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 );
862 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);
863 961
864 GvSV (PL_defgv) = newSV (0); 962 GvSV (PL_defgv) = newSV (0);
865 GvAV (PL_defgv) = coro->args; coro->args = 0; 963 GvAV (PL_defgv) = coro->args; coro->args = 0;
866 GvSV (PL_errgv) = newSV (0); 964 GvSV (PL_errgv) = newSV (0);
867 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;
868 PL_rs = newSVsv (GvSV (irsgv)); 967 PL_rs = newSVsv (GvSV (irsgv));
869 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
870 969
871 { 970 {
872 dSP; 971 dSP;
… …
890 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 */
891 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 */
892 991
893 /* 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 */
894 coro_setup_op.op_next = PL_op; 993 coro_setup_op.op_next = PL_op;
895 coro_setup_op.op_type = OP_CUSTOM; 994 coro_setup_op.op_type = OP_ENTERSUB;
896 coro_setup_op.op_ppaddr = pp_slf; 995 coro_setup_op.op_ppaddr = pp_slf;
897 /* no flags etc. required, as an init function won't be called */ 996 /* no flags etc. required, as an init function won't be called */
898 997
899 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
900 999
901 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
902 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
903}
904 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
905static void 1010static void
906coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
907{ 1012{
908 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
909 { 1014 {
910 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
911 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
… …
919 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
920 1025
921 /* unwind main stack */ 1026 /* unwind main stack */
922 dounwind (-1); 1027 dounwind (-1);
923 } 1028 }
1029}
924 1030
925 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
926 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
927 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
928 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
929 SvREFCNT_dec (PL_rs);
930 SvREFCNT_dec (GvSV (irsgv));
931 1035
932 SvREFCNT_dec (PL_diehook);
933 SvREFCNT_dec (PL_warnhook);
934 1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
1046
1047 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs;
1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1058
1059 load_perl (aTHX_ current);
1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
935 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
937 1070 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1071 SvREFCNT_dec (coro->invoke_av);
1072 }
939} 1073}
940 1074
941INLINE void 1075INLINE void
942free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
943{ 1077{
… …
951static int 1085static int
952runops_trace (pTHX) 1086runops_trace (pTHX)
953{ 1087{
954 COP *oldcop = 0; 1088 COP *oldcop = 0;
955 int oldcxix = -2; 1089 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1090
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1091 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1092 {
961 PERL_ASYNC_CHECK (); 1093 PERL_ASYNC_CHECK ();
962 1094
963 if (cctx->flags & CC_TRACE_ALL) 1095 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1096 {
965 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)
966 { 1098 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1099 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1100 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1101 AV *av = newAV (); /* return values */
970 SV **cb; 1102 SV **cb;
… …
1007 1139
1008 if (PL_curcop != &PL_compiling) 1140 if (PL_curcop != &PL_compiling)
1009 { 1141 {
1010 SV **cb; 1142 SV **cb;
1011 1143
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1145 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1147
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1149 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1150 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1151 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1152 SV *fullname = sv_2mortal (newSV (0));
1022 1153
1023 if (isGV (gv)) 1154 if (isGV (gv))
… …
1041 } 1172 }
1042 1173
1043 oldcxix = cxstack_ix; 1174 oldcxix = cxstack_ix;
1044 } 1175 }
1045 1176
1046 if (cctx->flags & CC_TRACE_LINE) 1177 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1178 {
1048 dSP; 1179 dSP;
1049 1180
1050 PL_runops = RUNOPS_DEFAULT; 1181 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1182 ENTER;
… …
1070 1201
1071 TAINT_NOT; 1202 TAINT_NOT;
1072 return 0; 1203 return 0;
1073} 1204}
1074 1205
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1206static struct CoroSLF cctx_ssl_frame;
1077 1207
1078static void 1208static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1209slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1210{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1211 ta->prev = 0;
1083} 1212}
1084 1213
1085static int 1214static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1215slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1216{
… …
1090 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 */
1091} 1220}
1092 1221
1093/* 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 */
1094static void NOINLINE 1223static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1224cctx_prepare (pTHX)
1096{ 1225{
1097 PL_top_env = &PL_start_env; 1226 PL_top_env = &PL_start_env;
1098 1227
1099 if (cctx->flags & CC_TRACE) 1228 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1229 PL_runops = runops_trace;
1101 1230
1102 /* 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
1103 * that can lead to creation of a new cctx */ 1232 * that can lead to creation of a new cctx */
1104 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)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1234 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1235
1107 /* 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 */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1237 cctx_ssl_frame = slf_frame;
1110 1238
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1239 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1240 slf_frame.check = slf_check_set_stacklevel;
1113} 1241}
… …
1136 /* normally we would need to skip the entersub here */ 1264 /* normally we would need to skip the entersub here */
1137 /* 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 */
1138 /* PL_nop = PL_nop->op_next */ 1266 /* PL_nop = PL_nop->op_next */
1139 1267
1140 /* inject a fake subroutine call to cctx_init */ 1268 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1269 cctx_prepare (aTHX);
1142 1270
1143 /* cctx_run is the alternative tail of transfer() */ 1271 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1272 transfer_tail (aTHX);
1145 1273
1146 /* 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 */
1147 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1149 /* 1277 /*
1150 * Unfortunately, there is no way to get at the return values of the 1278 * Unfortunately, there is no way to get at the return values of the
1151 * coro body here, as perl_run destroys these 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.
1152 */ 1281 */
1153 1282
1154 /* 1283 /*
1155 * 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
1156 * 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)
1157 * 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
1158 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1159 * 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.
1160 */ 1291 */
1161 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1162 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 */
1163 } 1294 }
1164} 1295}
… …
1241cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1242{ 1373{
1243 if (!cctx) 1374 if (!cctx)
1244 return; 1375 return;
1245 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1246 --cctx_count; 1379 --cctx_count;
1247 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1248 1381
1249 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1250 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1313 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1314 1447
1315 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1316 { 1449 {
1317 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1318 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,");
1319 1452
1320 if (expect_false (next->flags & CF_RUNNING))
1321 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1322
1323 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1324 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,");
1325 1455
1326#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1327 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1328 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,");
1329#endif 1459#endif
… …
1335transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1336{ 1466{
1337 dSTACKLEVEL; 1467 dSTACKLEVEL;
1338 1468
1339 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1340 if (expect_false (!next)) 1470 if (expect_false (!prev))
1341 { 1471 {
1342 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1472 cctx_current->idle_sp = STACKLEVEL;
1343 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 */
1344 } 1474 }
1345 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1346 { 1476 {
1347 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1348 1478
1349 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1350 { 1480 {
1351 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1352 prev->cctx = cctx_new_empty ();
1353 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1354 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1355 } 1484 }
1356 1485
1357 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1368 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1369 } 1498 }
1370 else 1499 else
1371 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1372 1501
1373 prev__cctx = prev->cctx;
1374
1375 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1376 if (expect_true ( 1503 if (expect_true (
1377 prev__cctx->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1378 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1379 && !force_cctx 1506 && !force_cctx
1380 )) 1507 ))
1381 { 1508 {
1382 /* 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 */
1383 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));
1384 1511
1385 prev->cctx = 0;
1386
1387 /* 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. */
1388 /* 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 */
1389 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1390 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1391 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1392 1517
1393 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1394 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1395 1522
1396 ++next->usecount; 1523 ++next->usecount;
1397 1524
1398 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1399 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1400 1527
1401 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1402 { 1531 {
1403 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1404 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1405 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1406 } 1535 }
1407 1536
1408 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1409 } 1538 }
1410} 1539}
… …
1418coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1419{ 1548{
1420 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1421 return 0; 1550 return 0;
1422 1551
1423 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1424 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1425 1554
1426 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1427 1556
1428 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1432 --coro_nready; 1561 --coro_nready;
1433 } 1562 }
1434 else 1563 else
1435 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 */
1436 1565
1437 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1438 { 1567 && coro->mainstack != main_mainstack
1439 struct coro temp; 1568 && coro->slot
1440 1569 && !PL_dirty)
1441 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1442
1443 save_perl (aTHX_ &temp);
1444 load_perl (aTHX_ coro);
1445
1446 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1447
1448 load_perl (aTHX_ &temp);
1449
1450 coro->slot = 0;
1451 }
1452 1571
1453 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1454 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1455 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1456 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
… …
1515 1634
1516 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1517 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1518} 1637}
1519 1638
1520/*****************************************************************************/
1521/* gensub: simple closure generation utility */
1522
1523#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1524
1525/* create a closure from XS, returns a code reference */
1526/* the arg can be accessed via GENSUB_ARG from the callback */
1527/* the callback must use dXSARGS/XSRETURN */
1528static SV *
1529gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1530{
1531 CV *cv = (CV *)newSV (0);
1532
1533 sv_upgrade ((SV *)cv, SVt_PVCV);
1534
1535 CvANON_on (cv);
1536 CvISXSUB_on (cv);
1537 CvXSUB (cv) = xsub;
1538 GENSUB_ARG = arg;
1539
1540 return newRV_noinc ((SV *)cv);
1541}
1542
1543/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1544 1640
1545INLINE void 1641INLINE void
1546coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1547{ 1643{
1548 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1549}
1550 1645
1551INLINE 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 *
1552coro_deq (pTHX) 1654coro_deq (pTHX)
1553{ 1655{
1554 int prio; 1656 int prio;
1555 1657
1556 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1557 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1558 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 }
1559 1669
1560 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;
1561} 1688}
1562 1689
1563static int 1690static int
1564api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1565{ 1692{
1566 struct coro *coro;
1567 SV *sv_hook;
1568 void (*xs_hook)(void);
1569
1570 if (SvROK (coro_sv))
1571 coro_sv = SvRV (coro_sv);
1572
1573 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1574 1694
1575 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1576 return 0; 1696 return 0;
1577 1697
1578 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1579 1699
1580 sv_hook = coro_nready ? 0 : coro_readyhook;
1581 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1582
1583 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1584 ++coro_nready;
1585 1701
1586 if (sv_hook) 1702 if (!coro_nready++)
1587 { 1703 if (coroapi.readyhook)
1588 dSP; 1704 coroapi.readyhook ();
1589
1590 ENTER;
1591 SAVETMPS;
1592
1593 PUSHMARK (SP);
1594 PUTBACK;
1595 call_sv (sv_hook, G_VOID | G_DISCARD);
1596
1597 FREETMPS;
1598 LEAVE;
1599 }
1600
1601 if (xs_hook)
1602 xs_hook ();
1603 1705
1604 return 1; 1706 return 1;
1605} 1707}
1606 1708
1607static int 1709static int
1608api_is_ready (pTHX_ SV *coro_sv) 1710api_is_ready (pTHX_ SV *coro_sv)
1609{ 1711{
1610 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1712 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1611} 1713}
1612 1714
1715/* expects to own a reference to next->hv */
1613INLINE void 1716INLINE void
1614prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1615{ 1718{
1616 SV *prev_sv, *next_sv;
1617
1618 for (;;)
1619 {
1620 next_sv = coro_deq (aTHX);
1621
1622 /* nothing to schedule: call the idle handler */
1623 if (expect_false (!next_sv))
1624 {
1625 dSP;
1626
1627 ENTER;
1628 SAVETMPS;
1629
1630 PUSHMARK (SP);
1631 PUTBACK;
1632 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1633
1634 FREETMPS;
1635 LEAVE;
1636 continue;
1637 }
1638
1639 ta->next = SvSTATE_hv (next_sv);
1640
1641 /* cannot transfer to destroyed coros, skip and look for next */
1642 if (expect_false (ta->next->flags & CF_DESTROYED))
1643 {
1644 SvREFCNT_dec (next_sv);
1645 /* coro_nready has already been taken care of by destroy */
1646 continue;
1647 }
1648
1649 --coro_nready;
1650 break;
1651 }
1652
1653 /* free this only after the transfer */
1654 prev_sv = SvRV (coro_current); 1719 SV *prev_sv = SvRV (coro_current);
1720
1655 ta->prev = SvSTATE_hv (prev_sv); 1721 ta->prev = SvSTATE_hv (prev_sv);
1722 ta->next = next;
1723
1656 TRANSFER_CHECK (*ta); 1724 TRANSFER_CHECK (*ta);
1657 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1725
1658 ta->next->flags &= ~CF_READY;
1659 SvRV_set (coro_current, next_sv); 1726 SvRV_set (coro_current, (SV *)next->hv);
1660 1727
1661 free_coro_mortal (aTHX); 1728 free_coro_mortal (aTHX);
1662 coro_mortal = prev_sv; 1729 coro_mortal = prev_sv;
1663} 1730}
1664 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
1665INLINE void 1781INLINE void
1666prepare_cede (pTHX_ struct coro_transfer_args *ta) 1782prepare_cede (pTHX_ struct coro_transfer_args *ta)
1667{ 1783{
1668 api_ready (aTHX_ coro_current); 1784 api_ready (aTHX_ coro_current);
1669 prepare_schedule (aTHX_ ta); 1785 prepare_schedule (aTHX_ ta);
… …
1688{ 1804{
1689 struct coro_transfer_args ta; 1805 struct coro_transfer_args ta;
1690 1806
1691 prepare_schedule (aTHX_ &ta); 1807 prepare_schedule (aTHX_ &ta);
1692 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);
1693} 1819}
1694 1820
1695static int 1821static int
1696api_cede (pTHX) 1822api_cede (pTHX)
1697{ 1823{
… …
1726static void 1852static void
1727api_trace (pTHX_ SV *coro_sv, int flags) 1853api_trace (pTHX_ SV *coro_sv, int flags)
1728{ 1854{
1729 struct coro *coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1730 1856
1857 if (coro->flags & CF_RUNNING)
1858 croak ("cannot enable tracing on a running coroutine, caught");
1859
1731 if (flags & CC_TRACE) 1860 if (flags & CC_TRACE)
1732 { 1861 {
1733 if (!coro->cctx) 1862 if (!coro->cctx)
1734 coro->cctx = cctx_new_run (); 1863 coro->cctx = cctx_new_run ();
1735 else if (!(coro->cctx->flags & CC_TRACE)) 1864 else if (!(coro->cctx->flags & CC_TRACE))
1736 croak ("cannot enable tracing on coroutine with custom stack,"); 1865 croak ("cannot enable tracing on coroutine with custom stack, caught");
1737 1866
1738 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1867 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1739 } 1868 }
1740 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1869 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1741 { 1870 {
… …
1746 else 1875 else
1747 coro->slot->runops = RUNOPS_DEFAULT; 1876 coro->slot->runops = RUNOPS_DEFAULT;
1748 } 1877 }
1749} 1878}
1750 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
1751/*****************************************************************************/ 2018/*****************************************************************************/
1752/* rouse callback */ 2019/* rouse callback */
1753 2020
1754#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2021#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1755 2022
1756static void 2023static void
1757coro_rouse_callback (pTHX_ CV *cv) 2024coro_rouse_callback (pTHX_ CV *cv)
1758{ 2025{
1759 dXSARGS; 2026 dXSARGS;
1760 SV *data = (SV *)GENSUB_ARG; 2027 SV *data = (SV *)S_GENSUB_ARG;
1761 2028
1762 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1763 { 2030 {
1764 /* first call, set args */ 2031 /* first call, set args */
1765 int i; 2032 SV *coro = SvRV (data);
1766 AV *av = newAV (); 2033 AV *av = newAV ();
1767 SV *coro = SvRV (data);
1768 2034
1769 SvRV_set (data, (SV *)av); 2035 SvRV_set (data, (SV *)av);
1770 api_ready (aTHX_ coro);
1771 SvREFCNT_dec (coro);
1772 2036
1773 /* better take a full copy of the arguments */ 2037 /* better take a full copy of the arguments */
1774 while (items--) 2038 while (items--)
1775 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);
1776 } 2043 }
1777 2044
1778 XSRETURN_EMPTY; 2045 XSRETURN_EMPTY;
1779} 2046}
1780 2047
… …
1797 2064
1798 EXTEND (SP, AvFILLp (av) + 1); 2065 EXTEND (SP, AvFILLp (av) + 1);
1799 for (i = 0; i <= AvFILLp (av); ++i) 2066 for (i = 0; i <= AvFILLp (av); ++i)
1800 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2067 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1801 2068
1802 /* 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 */
1803 AvFILLp (av) = -1; 2070 AvFILLp (av) = -1;
1804 av_undef (av); 2071 av_undef (av);
1805 2072
1806 PUTBACK; 2073 PUTBACK;
1807 } 2074 }
… …
1831 || SvTYPE (SvRV (cb)) != SVt_PVCV 2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
1832 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1833 croak ("Coro::rouse_wait called with illegal callback argument,"); 2100 croak ("Coro::rouse_wait called with illegal callback argument,");
1834 2101
1835 { 2102 {
1836 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1837 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
1838 2105
1839 frame->data = (void *)data; 2106 frame->data = (void *)data;
1840 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1841 frame->check = slf_check_rouse_wait; 2108 frame->check = slf_check_rouse_wait;
1842 } 2109 }
… …
1846coro_new_rouse_cb (pTHX) 2113coro_new_rouse_cb (pTHX)
1847{ 2114{
1848 HV *hv = (HV *)SvRV (coro_current); 2115 HV *hv = (HV *)SvRV (coro_current);
1849 struct coro *coro = SvSTATE_hv (hv); 2116 struct coro *coro = SvSTATE_hv (hv);
1850 SV *data = newRV_inc ((SV *)hv); 2117 SV *data = newRV_inc ((SV *)hv);
1851 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1852 2119
1853 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);
1854 SvREFCNT_dec (data); /* magicext increases the refcount */ 2121 SvREFCNT_dec (data); /* magicext increases the refcount */
1855 2122
1856 SvREFCNT_dec (coro->rouse_cb); 2123 SvREFCNT_dec (coro->rouse_cb);
… …
1911static void 2178static void
1912slf_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)
1913{ 2180{
1914 frame->prepare = prepare_schedule; 2181 frame->prepare = prepare_schedule;
1915 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);
1916} 2211}
1917 2212
1918static void 2213static void
1919slf_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)
1920{ 2215{
… …
2066 } 2361 }
2067 else 2362 else
2068 slf_argc = 0; 2363 slf_argc = 0;
2069 2364
2070 PL_op->op_ppaddr = pp_slf; 2365 PL_op->op_ppaddr = pp_slf;
2071 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 */
2072 2367
2073 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));
2074} 2416}
2075 2417
2076/*****************************************************************************/ 2418/*****************************************************************************/
2077/* PerlIO::cede */ 2419/* PerlIO::cede */
2078 2420
… …
2152/* Coro::Semaphore & Coro::Signal */ 2494/* Coro::Semaphore & Coro::Signal */
2153 2495
2154static SV * 2496static SV *
2155coro_waitarray_new (pTHX_ int count) 2497coro_waitarray_new (pTHX_ int count)
2156{ 2498{
2157 /* 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 */
2158 AV *av = newAV (); 2500 AV *av = newAV ();
2159 SV **ary; 2501 SV **ary;
2160 2502
2161 /* unfortunately, building manually saves memory */ 2503 /* unfortunately, building manually saves memory */
2162 Newx (ary, 2, SV *); 2504 Newx (ary, 2, SV *);
2163 AvALLOC (av) = ary; 2505 AvALLOC (av) = ary;
2506#if PERL_VERSION_ATLEAST (5,10,0)
2164 /*AvARRAY (av) = ary;*/ 2507 AvARRAY (av) = ary;
2508#else
2165 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 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
2166 AvMAX (av) = 1; 2513 AvMAX (av) = 1;
2167 AvFILLp (av) = 0; 2514 AvFILLp (av) = 0;
2168 ary [0] = newSViv (count); 2515 ary [0] = newSViv (count);
2169 2516
2170 return newRV_noinc ((SV *)av); 2517 return newRV_noinc ((SV *)av);
… …
2299{ 2646{
2300 if (items >= 2) 2647 if (items >= 2)
2301 { 2648 {
2302 /* callback form */ 2649 /* callback form */
2303 AV *av = (AV *)SvRV (arg [0]); 2650 AV *av = (AV *)SvRV (arg [0]);
2304 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2305 2652
2306 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2307 2654
2308 if (SvIVX (AvARRAY (av)[0]) > 0) 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2309 coro_semaphore_adjust (aTHX_ av, 0); 2656 coro_semaphore_adjust (aTHX_ av, 0);
2310 2657
2311 frame->prepare = prepare_nop; 2658 frame->prepare = prepare_nop;
… …
2335 AvARRAY (av)[0] = AvARRAY (av)[1]; 2682 AvARRAY (av)[0] = AvARRAY (av)[1];
2336 AvARRAY (av)[1] = cb; 2683 AvARRAY (av)[1] = cb;
2337 2684
2338 cb = av_shift (av); 2685 cb = av_shift (av);
2339 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 {
2340 api_ready (aTHX_ cb); 2697 api_ready (aTHX_ cb);
2341 sv_setiv (cb, 0); /* signal waiter */ 2698 sv_setiv (cb, 0); /* signal waiter */
2699 }
2700
2342 SvREFCNT_dec (cb); 2701 SvREFCNT_dec (cb);
2343 2702
2344 --count; 2703 --count;
2345 } 2704 }
2346} 2705}
… …
2355static void 2714static void
2356slf_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)
2357{ 2716{
2358 AV *av = (AV *)SvRV (arg [0]); 2717 AV *av = (AV *)SvRV (arg [0]);
2359 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
2360 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]))
2361 { 2731 {
2362 SvIVX (AvARRAY (av)[0]) = 0; 2732 SvIVX (AvARRAY (av)[0]) = 0;
2363 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2364 frame->check = slf_check_nop; 2734 frame->check = slf_check_nop;
2365 } 2735 }
2366 else 2736 else
2367 { 2737 {
2368 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2738 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2369 2739
2370 av_push (av, waiter); 2740 av_push (av, waiter);
2371 2741
2372 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 */
2373 frame->prepare = prepare_schedule; 2743 frame->prepare = prepare_schedule;
… …
2391 2761
2392static void 2762static void
2393coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2394{ 2764{
2395 dXSARGS; 2765 dXSARGS;
2396 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2397 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2398 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2399 2769
2400 av_extend (state, items); 2770 av_extend (state, items - 1);
2401 2771
2402 sv_upgrade (data_sv, SVt_PV); 2772 sv_upgrade (data_sv, SVt_PV);
2403 SvCUR_set (data_sv, sizeof (struct io_state)); 2773 SvCUR_set (data_sv, sizeof (struct io_state));
2404 SvPOK_only (data_sv); 2774 SvPOK_only (data_sv);
2405 2775
… …
2515 2885
2516 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2517 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2518 2888
2519 /* now push the callback closure */ 2889 /* now push the callback closure */
2520 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))));
2521 2891
2522 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2523 PUTBACK; 2893 PUTBACK;
2524 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2525 } 2895 }
… …
2539 2909
2540 XSRETURN_EMPTY; 2910 XSRETURN_EMPTY;
2541} 2911}
2542 2912
2543/*****************************************************************************/ 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}
2544 2976
2545MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2546 2978
2547PROTOTYPES: DISABLE 2979PROTOTYPES: DISABLE
2548 2980
… …
2553 coro_thx = PERL_GET_CONTEXT; 2985 coro_thx = PERL_GET_CONTEXT;
2554# endif 2986# endif
2555#endif 2987#endif
2556 BOOT_PAGESIZE; 2988 BOOT_PAGESIZE;
2557 2989
2990 cctx_current = cctx_new_empty ();
2991
2558 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2559 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2560 2994
2561 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;
2562 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;
… …
2581 3015
2582 { 3016 {
2583 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3017 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2584 3018
2585 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3019 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2586 hv_store_ent (PL_custom_op_names, slf, 3020 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2587 newSVpv ("coro_slf", 0), 0);
2588 3021
2589 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3022 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2590 hv_store_ent (PL_custom_op_descs, slf, 3023 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2591 newSVpv ("coro schedule like function", 0), 0);
2592 } 3024 }
2593 3025
2594 coroapi.ver = CORO_API_VERSION; 3026 coroapi.ver = CORO_API_VERSION;
2595 coroapi.rev = CORO_API_REVISION; 3027 coroapi.rev = CORO_API_REVISION;
2596 3028
… …
2608 3040
2609 if (!svp) croak ("Time::HiRes is required"); 3041 if (!svp) croak ("Time::HiRes is required");
2610 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2611 3043
2612 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));
2613 } 3048 }
2614 3049
2615 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2616} 3051}
2617 3052
2618SV * 3053SV *
2619new (char *klass, ...) 3054new (SV *klass, ...)
2620 ALIAS: 3055 ALIAS:
2621 Coro::new = 1 3056 Coro::new = 1
2622 CODE: 3057 CODE:
2623{ 3058 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2624 struct coro *coro; 3059 OUTPUT:
2625 MAGIC *mg;
2626 HV *hv;
2627 CV *cb;
2628 int i;
2629
2630 if (items > 1)
2631 {
2632 cb = coro_sv_2cv (aTHX_ ST (1));
2633
2634 if (!ix)
2635 {
2636 if (CvISXSUB (cb))
2637 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2638
2639 if (!CvROOT (cb))
2640 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2641 }
2642 }
2643
2644 Newz (0, coro, 1, struct coro);
2645 coro->args = newAV ();
2646 coro->flags = CF_NEW;
2647
2648 if (coro_first) coro_first->prev = coro;
2649 coro->next = coro_first;
2650 coro_first = coro;
2651
2652 coro->hv = hv = newHV ();
2653 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2654 mg->mg_flags |= MGf_DUP;
2655 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2656
2657 if (items > 1)
2658 {
2659 av_extend (coro->args, items - 1 + ix);
2660
2661 if (ix)
2662 {
2663 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2664 cb = cv_coro_run;
2665 }
2666
2667 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2668
2669 for (i = 2; i < items; i++)
2670 av_push (coro->args, newSVsv (ST (i)));
2671 }
2672}
2673 OUTPUT:
2674 RETVAL 3060 RETVAL
2675 3061
2676void 3062void
2677transfer (...) 3063transfer (...)
2678 PROTOTYPE: $$ 3064 PROTOTYPE: $$
… …
2689void 3075void
2690_exit (int code) 3076_exit (int code)
2691 PROTOTYPE: $ 3077 PROTOTYPE: $
2692 CODE: 3078 CODE:
2693 _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
2694 3099
2695int 3100int
2696cctx_stacksize (int new_stacksize = 0) 3101cctx_stacksize (int new_stacksize = 0)
2697 PROTOTYPE: ;$ 3102 PROTOTYPE: ;$
2698 CODE: 3103 CODE:
… …
2748 eval = 1 3153 eval = 1
2749 CODE: 3154 CODE:
2750{ 3155{
2751 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2752 { 3157 {
2753 struct coro temp; 3158 struct coro *current = SvSTATE_current;
2754 3159
2755 if (!(coro->flags & CF_RUNNING)) 3160 if (current != coro)
2756 { 3161 {
2757 PUTBACK; 3162 PUTBACK;
2758 save_perl (aTHX_ &temp); 3163 save_perl (aTHX_ current);
2759 load_perl (aTHX_ coro); 3164 load_perl (aTHX_ coro);
3165 SPAGAIN;
2760 } 3166 }
2761 3167
2762 {
2763 dSP;
2764 ENTER;
2765 SAVETMPS;
2766 PUTBACK;
2767 PUSHSTACK; 3168 PUSHSTACK;
3169
2768 PUSHMARK (SP); 3170 PUSHMARK (SP);
3171 PUTBACK;
2769 3172
2770 if (ix) 3173 if (ix)
2771 eval_sv (coderef, 0); 3174 eval_sv (coderef, 0);
2772 else 3175 else
2773 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3176 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2774 3177
2775 POPSTACK; 3178 POPSTACK;
2776 SPAGAIN; 3179 SPAGAIN;
2777 FREETMPS;
2778 LEAVE;
2779 PUTBACK;
2780 }
2781 3180
2782 if (!(coro->flags & CF_RUNNING)) 3181 if (current != coro)
2783 { 3182 {
3183 PUTBACK;
2784 save_perl (aTHX_ coro); 3184 save_perl (aTHX_ coro);
2785 load_perl (aTHX_ &temp); 3185 load_perl (aTHX_ current);
2786 SPAGAIN; 3186 SPAGAIN;
2787 } 3187 }
2788 } 3188 }
2789} 3189}
2790 3190
… …
2794 ALIAS: 3194 ALIAS:
2795 is_ready = CF_READY 3195 is_ready = CF_READY
2796 is_running = CF_RUNNING 3196 is_running = CF_RUNNING
2797 is_new = CF_NEW 3197 is_new = CF_NEW
2798 is_destroyed = CF_DESTROYED 3198 is_destroyed = CF_DESTROYED
3199 is_suspended = CF_SUSPENDED
2799 CODE: 3200 CODE:
2800 RETVAL = boolSV (coro->flags & ix); 3201 RETVAL = boolSV (coro->flags & ix);
2801 OUTPUT: 3202 OUTPUT:
2802 RETVAL 3203 RETVAL
2803 3204
… …
2807 CODE: 3208 CODE:
2808{ 3209{
2809 struct coro *current = SvSTATE_current; 3210 struct coro *current = SvSTATE_current;
2810 SV **throwp = self == current ? &CORO_THROW : &self->except; 3211 SV **throwp = self == current ? &CORO_THROW : &self->except;
2811 SvREFCNT_dec (*throwp); 3212 SvREFCNT_dec (*throwp);
3213 SvGETMAGIC (throw);
2812 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2813} 3215}
2814 3216
2815void 3217void
2816api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2819 3221
2820SV * 3222SV *
2821has_cctx (Coro::State coro) 3223has_cctx (Coro::State coro)
2822 PROTOTYPE: $ 3224 PROTOTYPE: $
2823 CODE: 3225 CODE:
2824 RETVAL = boolSV (!!coro->cctx); 3226 /* maybe manage the running flag differently */
3227 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2825 OUTPUT: 3228 OUTPUT:
2826 RETVAL 3229 RETVAL
2827 3230
2828int 3231int
2829is_traced (Coro::State coro) 3232is_traced (Coro::State coro)
… …
2849 3252
2850void 3253void
2851force_cctx () 3254force_cctx ()
2852 PROTOTYPE: 3255 PROTOTYPE:
2853 CODE: 3256 CODE:
2854 SvSTATE_current->cctx->idle_sp = 0; 3257 cctx_current->idle_sp = 0;
2855 3258
2856void 3259void
2857swap_defsv (Coro::State self) 3260swap_defsv (Coro::State self)
2858 PROTOTYPE: $ 3261 PROTOTYPE: $
2859 ALIAS: 3262 ALIAS:
… …
2867 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3270 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2868 3271
2869 SV *tmp = *src; *src = *dst; *dst = tmp; 3272 SV *tmp = *src; *src = *dst; *dst = tmp;
2870 } 3273 }
2871 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}
2872 3318
2873MODULE = Coro::State PACKAGE = Coro 3319MODULE = Coro::State PACKAGE = Coro
2874 3320
2875BOOT: 3321BOOT:
2876{ 3322{
2877 int i;
2878
2879 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2880 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2881 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2882 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2883 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2884 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);
2885 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
2886 coro_stash = gv_stashpv ("Coro", TRUE); 3338 coro_stash = gv_stashpv ("Coro", TRUE);
2887 3339
2888 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3340 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2889 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3341 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2890 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3342 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2891 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3343 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2892 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3344 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2893 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3345 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2894
2895 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2896 coro_ready[i] = newAV ();
2897 3346
2898 { 3347 {
2899 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3348 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2900 3349
2901 coroapi.schedule = api_schedule; 3350 coroapi.schedule = api_schedule;
3351 coroapi.schedule_to = api_schedule_to;
2902 coroapi.cede = api_cede; 3352 coroapi.cede = api_cede;
2903 coroapi.cede_notself = api_cede_notself; 3353 coroapi.cede_notself = api_cede_notself;
2904 coroapi.ready = api_ready; 3354 coroapi.ready = api_ready;
2905 coroapi.is_ready = api_is_ready; 3355 coroapi.is_ready = api_is_ready;
2906 coroapi.nready = coro_nready; 3356 coroapi.nready = coro_nready;
… …
2910 sv_setiv (sv, (IV)&coroapi); 3360 sv_setiv (sv, (IV)&coroapi);
2911 SvREADONLY_on (sv); 3361 SvREADONLY_on (sv);
2912 } 3362 }
2913} 3363}
2914 3364
3365SV *
3366async (...)
3367 PROTOTYPE: &@
3368 CODE:
3369 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3370 api_ready (aTHX_ RETVAL);
3371 OUTPUT:
3372 RETVAL
3373
3374void
3375terminate (...)
3376 CODE:
3377 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3378
2915void 3379void
2916schedule (...) 3380schedule (...)
2917 CODE: 3381 CODE:
2918 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);
2919 3393
2920void 3394void
2921cede (...) 3395cede (...)
2922 CODE: 3396 CODE:
2923 CORO_EXECUTE_SLF_XS (slf_init_cede); 3397 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2937void 3411void
2938_set_readyhook (SV *hook) 3412_set_readyhook (SV *hook)
2939 PROTOTYPE: $ 3413 PROTOTYPE: $
2940 CODE: 3414 CODE:
2941 SvREFCNT_dec (coro_readyhook); 3415 SvREFCNT_dec (coro_readyhook);
3416 SvGETMAGIC (hook);
3417 if (SvOK (hook))
3418 {
2942 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 }
2943 3427
2944int 3428int
2945prio (Coro::State coro, int newprio = 0) 3429prio (Coro::State coro, int newprio = 0)
2946 PROTOTYPE: $;$ 3430 PROTOTYPE: $;$
2947 ALIAS: 3431 ALIAS:
… …
2953 if (items > 1) 3437 if (items > 1)
2954 { 3438 {
2955 if (ix) 3439 if (ix)
2956 newprio = coro->prio - newprio; 3440 newprio = coro->prio - newprio;
2957 3441
2958 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3442 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2959 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3443 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2960 3444
2961 coro->prio = newprio; 3445 coro->prio = newprio;
2962 } 3446 }
2963} 3447}
2964 OUTPUT: 3448 OUTPUT:
… …
2978 CODE: 3462 CODE:
2979 RETVAL = coro_nready; 3463 RETVAL = coro_nready;
2980 OUTPUT: 3464 OUTPUT:
2981 RETVAL 3465 RETVAL
2982 3466
2983# for async_pool speedup
2984void 3467void
2985_pool_1 (SV *cb) 3468suspend (Coro::State self)
3469 PROTOTYPE: $
2986 CODE: 3470 CODE:
2987{ 3471 self->flags |= CF_SUSPENDED;
2988 HV *hv = (HV *)SvRV (coro_current);
2989 struct coro *coro = SvSTATE_hv ((SV *)hv);
2990 AV *defav = GvAV (PL_defgv);
2991 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2992 AV *invoke_av;
2993 int i, len;
2994 3472
2995 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)
2996 { 3499 {
2997 SV *old = PL_diehook; 3500 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2998 PL_diehook = 0; 3501 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2999 SvREFCNT_dec (old); 3502 SvREFCNT_dec (sv);
3000 croak ("\3async_pool terminate\2\n");
3001 } 3503 }
3002 3504
3003 SvREFCNT_dec (coro->saved_deffh);
3004 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
3005
3006 hv_store (hv, "desc", sizeof ("desc") - 1,
3007 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
3008
3009 invoke_av = (AV *)SvRV (invoke);
3010 len = av_len (invoke_av);
3011
3012 sv_setsv (cb, AvARRAY (invoke_av)[0]);
3013
3014 if (len > 0)
3015 { 3505 {
3016 av_fill (defav, len - 1); 3506 struct coro *coro = SvSTATE_hv (hv);
3017 for (i = 0; i < len; ++i) 3507
3018 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;
3019 } 3512 }
3020}
3021 3513
3022void 3514 api_ready (aTHX_ (SV *)hv);
3023_pool_2 (SV *cb)
3024 CODE:
3025{
3026 HV *hv = (HV *)SvRV (coro_current);
3027 struct coro *coro = SvSTATE_hv ((SV *)hv);
3028 3515
3029 sv_setsv (cb, &PL_sv_undef); 3516 if (GIMME_V != G_VOID)
3030 3517 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3031 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3518 else
3032 coro->saved_deffh = 0;
3033
3034 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3035 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3036 {
3037 SV *old = PL_diehook;
3038 PL_diehook = 0;
3039 SvREFCNT_dec (old); 3519 SvREFCNT_dec (hv);
3040 croak ("\3async_pool terminate\2\n");
3041 }
3042
3043 av_clear (GvAV (PL_defgv));
3044 hv_store (hv, "desc", sizeof ("desc") - 1,
3045 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3046
3047 coro->prio = 0;
3048
3049 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3050 api_trace (aTHX_ coro_current, 0);
3051
3052 av_push (av_async_pool, newSVsv (coro_current));
3053} 3520}
3054 3521
3055SV * 3522SV *
3056rouse_cb () 3523rouse_cb ()
3057 PROTOTYPE: 3524 PROTOTYPE:
… …
3064rouse_wait (...) 3531rouse_wait (...)
3065 PROTOTYPE: ;$ 3532 PROTOTYPE: ;$
3066 PPCODE: 3533 PPCODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3534 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3068 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
3069 3561
3070MODULE = Coro::State PACKAGE = PerlIO::cede 3562MODULE = Coro::State PACKAGE = PerlIO::cede
3071 3563
3072BOOT: 3564BOOT:
3073 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3565 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3076MODULE = Coro::State PACKAGE = Coro::Semaphore 3568MODULE = Coro::State PACKAGE = Coro::Semaphore
3077 3569
3078SV * 3570SV *
3079new (SV *klass, SV *count = 0) 3571new (SV *klass, SV *count = 0)
3080 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
3081 RETVAL = sv_bless ( 3584 RETVAL = sv_bless (
3082 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3585 coro_waitarray_new (aTHX_ semcnt),
3083 GvSTASH (CvGV (cv)) 3586 GvSTASH (CvGV (cv))
3084 ); 3587 );
3588}
3085 OUTPUT: 3589 OUTPUT:
3086 RETVAL 3590 RETVAL
3087 3591
3088# helper for Coro::Channel 3592# helper for Coro::Channel and others
3089SV * 3593SV *
3090_alloc (int count) 3594_alloc (int count)
3091 CODE: 3595 CODE:
3092 RETVAL = coro_waitarray_new (aTHX_ count); 3596 RETVAL = coro_waitarray_new (aTHX_ count);
3093 OUTPUT: 3597 OUTPUT:
… …
3151 for (i = 1; i <= wcount; ++i) 3655 for (i = 1; i <= wcount; ++i)
3152 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3656 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3153 } 3657 }
3154} 3658}
3155 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
3156MODULE = Coro::State PACKAGE = Coro::Signal 3676MODULE = Coro::State PACKAGE = Coro::Signal
3157 3677
3158SV * 3678SV *
3159new (SV *klass) 3679new (SV *klass)
3160 CODE: 3680 CODE:
… …
3231 3751
3232void 3752void
3233_register (char *target, char *proto, SV *req) 3753_register (char *target, char *proto, SV *req)
3234 CODE: 3754 CODE:
3235{ 3755{
3236 CV *req_cv = coro_sv_2cv (aTHX_ req); 3756 SV *req_cv = s_get_cv_croak (req);
3237 /* newXSproto doesn't return the CV on 5.8 */ 3757 /* newXSproto doesn't return the CV on 5.8 */
3238 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3758 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3239 sv_setpv ((SV *)slf_cv, proto); 3759 sv_setpv ((SV *)slf_cv, proto);
3240 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);
3241} 3761}
3242 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