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.318 by root, Thu Nov 20 07:02:43 2008 UTC vs.
Revision 1.367 by root, Mon Aug 3 09:19:57 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) && PERL_SUBVERSION >= (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#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
114#endif 58#endif
115 59
116#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
130#else 74#else
131# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
133#endif 77#endif
134 78
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
136 80
137#if __GNUC__ >= 3 81#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 84# define INLINE static inline
141#else 85#else
142# define attribute(x) 86# define attribute(x)
143# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
144# define INLINE static 88# define INLINE static
… …
156# if CORO_PTHREAD 100# if CORO_PTHREAD
157static void *coro_thx; 101static void *coro_thx;
158# endif 102# endif
159#endif 103#endif
160 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
161static 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]);
162 117
163/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
166 121
… …
172static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 129
175static AV *av_destroy; /* destruction queue */ 130static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
177 133
178static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 136static SV *rv_diehook;
181static SV *rv_warnhook; 137static SV *rv_warnhook;
… …
191static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
192 148
193/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
194static SV *sv_activity; 150static SV *sv_activity;
195 151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
157
196static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
197static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
198 160
199enum { 161enum {
200 CC_MAPPED = 0x01, 162 CC_MAPPED = 0x01,
… …
225 int valgrind_id; 187 int valgrind_id;
226#endif 188#endif
227 unsigned char flags; 189 unsigned char flags;
228} coro_cctx; 190} coro_cctx;
229 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
230enum { 196enum {
231 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
234 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
235}; 202};
236 203
237/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
238typedef struct 205typedef struct
239{ 206{
240 SV *defsv; 207 SV *defsv;
241 AV *defav; 208 AV *defav;
242 SV *errsv; 209 SV *errsv;
243 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
244#define VAR(name,type) type name; 212#define VAR(name,type) type name;
245# include "state.h" 213# include "state.h"
246#undef VAR 214#undef VAR
247} perl_slots; 215} perl_slots;
248 216
… …
250 218
251/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
252struct coro { 220struct coro {
253 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
254 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
255 226
256 /* state data */ 227 /* state data */
257 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
258 AV *mainstack; 229 AV *mainstack;
259 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
… …
276 /* async_pool */ 247 /* async_pool */
277 SV *saved_deffh; 248 SV *saved_deffh;
278 SV *invoke_cb; 249 SV *invoke_cb;
279 AV *invoke_av; 250 AV *invoke_av;
280 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
258
281 /* linked list */ 259 /* linked list */
282 struct coro *next, *prev; 260 struct coro *next, *prev;
283}; 261};
284 262
285typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
290/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
291static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
292 270
293/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
294 272
295#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
296#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
297#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
298#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
299#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
300#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
301 279
302/* for Coro.pm */ 280/* for Coro.pm */
303static SV *coro_current; 281static SV *coro_current;
304static SV *coro_readyhook; 282static SV *coro_readyhook;
305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
306static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
307static struct coro *coro_first; 285static struct coro *coro_first;
308#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
309 307
310/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
311 309
312static SV * 310static SV *
313coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
337 get_hv (name, create); 335 get_hv (name, create);
338#endif 336#endif
339 return get_hv (name, create); 337 return get_hv (name, create);
340} 338}
341 339
342/* may croak */ 340INLINE void
343INLINE CV * 341coro_times_update ()
344coro_sv_2cv (pTHX_ SV *sv)
345{ 342{
343#ifdef coro_clock_gettime
344 struct timespec ts;
345
346 ts.tv_sec = ts.tv_nsec = 0;
347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
349
350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
385}
386
387/*****************************************************************************/
388/* magic glue */
389
390#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext
392
393#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \
396 : mg_find (sv, type))
397
398#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \
401 : 0)
402
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405
406INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro)
408{
346 HV *st; 409 HV *stash;
347 GV *gvp; 410 MAGIC *mg;
348 return sv_2cv (sv, &st, &gvp, 0); 411
412 if (SvROK (coro))
413 coro = SvRV (coro);
414
415 if (expect_false (SvTYPE (coro) != SVt_PVHV))
416 croak ("Coro::State object required");
417
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr;
349} 428}
429
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431
432/* faster than SvSTATE, but expects a coroutine hv */
433#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435
436/*****************************************************************************/
437/* padlist management and caching */
350 438
351static AV * 439static AV *
352coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
353{ 441{
354 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
356 444
357 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 451#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 453 --AvFILLp (padlist);
366 454
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
369 457
370 return newpadlist; 458 return newpadlist;
371} 459}
372 460
373static void 461static void
374free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
375{ 463{
376 /* may be during global destruction */ 464 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
378 { 466 {
379 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
380 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
381 { 470 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
383 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 473 I32 j = AvFILLp (av);
385 SV *sv; 474
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 480 }
392 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
394 } 486 }
395} 487}
396 488
397static int 489static int
398coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
399{ 491{
400 AV *padlist; 492 AV *padlist;
401 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
402 498
403 /* casting is fun. */ 499 /* casting is fun. */
404 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
405 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
406 502
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 504
409 return 0; 505 return 0;
410} 506}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 507
415static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 509 0, 0, 0, 0,
417 coro_cv_free 510 coro_cv_free
418}; 511};
419
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462 512
463/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
464static void 514static void
465get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
466{ 516{
… …
477 CV *cp = Perl_cv_clone (aTHX_ cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
481#else 531#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 533#endif
484 } 534 }
485} 535}
486 536
487static void 537static void
… …
494 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
495 545
496 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
497 547
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
500 550
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 552}
503 553
504/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
505 558
506static void 559static void
507load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
508{ 561{
509 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
510 c->slot = 0; 563 c->slot = 0;
511 564
512 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
513 566
514 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
518 572
519 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 574 # include "state.h"
521 #undef VAR 575 #undef VAR
522 576
… …
536 PUTBACK; 590 PUTBACK;
537 } 591 }
538 592
539 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
540 CORO_THROW = c->except; 594 CORO_THROW = c->except;
595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
604 if (expect_false (c->on_enter))
605 {
606 int i;
607
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 }
541} 611}
542 612
543static void 613static void
544save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
545{ 615{
616 if (expect_false (c->on_leave))
617 {
618 int i;
619
620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
630 }
631
546 c->except = CORO_THROW; 632 c->except = CORO_THROW;
547 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
548 634
549 { 635 {
550 dSP; 636 dSP;
… …
563 { 649 {
564 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
565 { 651 {
566 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
567 653
568 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
569 { 655 {
570 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
571 657
572 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
573 { 659 {
… …
597 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
598 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
599 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
600 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
601 { 687 {
602 int i; 688 unsigned int i;
603 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
604 CXINC; 690 CXINC;
605 } 691 }
606 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
607 693
608 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
609 695
610 { 696 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 698
613 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
617 704
618 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 706 # include "state.h"
620 #undef VAR 707 #undef VAR
621 } 708 }
… …
748#endif 835#endif
749 836
750/* 837/*
751 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
752 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
753 * and instead of tryign to save and restore the hash elements, we just provide 840 * and instead of trying to save and restore the hash elements, we just provide
754 * readback here. 841 * readback here.
755 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
756 * not expecting this to actually change the hook. This is a potential problem
757 * when a schedule happens then, but we ignore this.
758 */ 842 */
759static int 843static int
760coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
761{ 845{
762 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 900
817 if (svp) 901 if (svp)
818 { 902 {
819 SV *old = *svp; 903 SV *old = *svp;
820 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
821 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
822 return 0; 906 return 0;
823 } 907 }
824 } 908 }
825 909
… …
857 941
858 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 949 PL_curpm = 0;
863 PL_curpad = 0; 950 PL_curpad = 0;
864 PL_localizing = 0; 951 PL_localizing = 0;
865 PL_dirty = 0; 952 PL_dirty = 0;
866 PL_restartop = 0; 953 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 955 PL_parser = 0;
869#endif 956#endif
957 PL_hints = 0;
870 958
871 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
872 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
873 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
874 962
875 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
878 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0;
879 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 970
882 { 971 {
883 dSP; 972 dSP;
… …
901 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
902 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
903 992
904 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
905 coro_setup_op.op_next = PL_op; 994 coro_setup_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_CUSTOM; 995 coro_setup_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 996 coro_setup_op.op_ppaddr = pp_slf;
908 /* no flags etc. required, as an init function won't be called */ 997 /* no flags etc. required, as an init function won't be called */
909 998
910 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
911 1000
912 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
913 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
914}
915 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
916static void 1011static void
917coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
918{ 1013{
919 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
920 { 1015 {
921 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
930 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
931 1026
932 /* unwind main stack */ 1027 /* unwind main stack */
933 dounwind (-1); 1028 dounwind (-1);
934 } 1029 }
1030}
935 1031
936 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
937 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
938 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
939 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
940 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv));
942 1036
943 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook);
945 1037 {
1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
1047
1048 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs;
1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1059
1060 load_perl (aTHX_ current);
1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
946 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
947 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
950 1073 }
951 coro_destruct_stacks (aTHX);
952} 1074}
953 1075
954INLINE void 1076INLINE void
955free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
956{ 1078{
… …
964static int 1086static int
965runops_trace (pTHX) 1087runops_trace (pTHX)
966{ 1088{
967 COP *oldcop = 0; 1089 COP *oldcop = 0;
968 int oldcxix = -2; 1090 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 1091
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 1093 {
974 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
975 1095
976 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1097 {
978 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1098 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
979 { 1099 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1101 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
983 SV **cb; 1103 SV **cb;
… …
1020 1140
1021 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
1022 { 1142 {
1023 SV **cb; 1143 SV **cb;
1024 1144
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1146 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1148
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1150 {
1031 runops_proc_t old_runops = PL_runops;
1032 dSP; 1151 dSP;
1033 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
1034 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
1035 1154
1036 if (isGV (gv)) 1155 if (isGV (gv))
… …
1054 } 1173 }
1055 1174
1056 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1057 } 1176 }
1058 1177
1059 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1060 { 1179 {
1061 dSP; 1180 dSP;
1062 1181
1063 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1064 ENTER; 1183 ENTER;
… …
1083 1202
1084 TAINT_NOT; 1203 TAINT_NOT;
1085 return 0; 1204 return 0;
1086} 1205}
1087 1206
1088static struct coro_cctx *cctx_ssl_cctx;
1089static struct CoroSLF cctx_ssl_frame; 1207static struct CoroSLF cctx_ssl_frame;
1090 1208
1091static void 1209static void
1092slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1093{ 1211{
1094 ta->prev = (struct coro *)cctx_ssl_cctx;
1095 ta->next = 0; 1212 ta->prev = 0;
1096} 1213}
1097 1214
1098static int 1215static int
1099slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1100{ 1217{
… …
1103 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1104} 1221}
1105 1222
1106/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1107static void NOINLINE 1224static void NOINLINE
1108cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1109{ 1226{
1110 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1111 1228
1112 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1113 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1114 1231
1115 /* we already must be executing an SLF op, there is no other valid way 1232 /* we already must be executing an SLF op, there is no other valid way
1116 * that can lead to creation of a new cctx */ 1233 * that can lead to creation of a new cctx */
1117 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1234 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1118 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1119 1236
1120 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1237 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1121 cctx_ssl_cctx = cctx;
1122 cctx_ssl_frame = slf_frame; 1238 cctx_ssl_frame = slf_frame;
1123 1239
1124 slf_frame.prepare = slf_prepare_set_stacklevel; 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1125 slf_frame.check = slf_check_set_stacklevel; 1241 slf_frame.check = slf_check_set_stacklevel;
1126} 1242}
… …
1149 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1150 /* not doing so will re-execute it, which is exactly what we want */ 1266 /* not doing so will re-execute it, which is exactly what we want */
1151 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1152 1268
1153 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1154 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1155 1271
1156 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1157 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1158 1274
1159 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1160 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1161 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1162 /* 1278 /*
1163 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1164 * coro body here, as perl_run destroys these 1280 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1281 * runtime errors here, as this is just a random interpreter, not a thread.
1165 */ 1282 */
1166 1283
1167 /* 1284 /*
1168 * If perl-run returns we assume exit() was being called or the coro 1285 * If perl-run returns we assume exit() was being called or the coro
1169 * fell off the end, which seems to be the only valid (non-bug) 1286 * fell off the end, which seems to be the only valid (non-bug)
1170 * reason for perl_run to return. We try to exit by jumping to the 1287 * reason for perl_run to return. We try to exit by jumping to the
1171 * bootstrap-time "top" top_env, as we cannot restore the "main" 1288 * bootstrap-time "top" top_env, as we cannot restore the "main"
1172 * coroutine as Coro has no such concept 1289 * coroutine as Coro has no such concept.
1290 * This actually isn't valid with the pthread backend, but OSes requiring
1291 * that backend are too broken to do it in a standards-compliant way.
1173 */ 1292 */
1174 PL_top_env = main_top_env; 1293 PL_top_env = main_top_env;
1175 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1294 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1176 } 1295 }
1177} 1296}
… …
1254cctx_destroy (coro_cctx *cctx) 1373cctx_destroy (coro_cctx *cctx)
1255{ 1374{
1256 if (!cctx) 1375 if (!cctx)
1257 return; 1376 return;
1258 1377
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1379
1259 --cctx_count; 1380 --cctx_count;
1260 coro_destroy (&cctx->cctx); 1381 coro_destroy (&cctx->cctx);
1261 1382
1262 /* coro_transfer creates new, empty cctx's */ 1383 /* coro_transfer creates new, empty cctx's */
1263 if (cctx->sptr) 1384 if (cctx->sptr)
… …
1326 /* TODO: throwing up here is considered harmful */ 1447 /* TODO: throwing up here is considered harmful */
1327 1448
1328 if (expect_true (prev != next)) 1449 if (expect_true (prev != next))
1329 { 1450 {
1330 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1331 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1452 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1332 1453
1333 if (expect_false (next->flags & CF_RUNNING))
1334 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1335
1336 if (expect_false (next->flags & CF_DESTROYED)) 1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1337 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1455 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1338 1456
1339#if !PERL_VERSION_ATLEAST (5,10,0) 1457#if !PERL_VERSION_ATLEAST (5,10,0)
1340 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1458 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1341 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1459 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1342#endif 1460#endif
… …
1348transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1349{ 1467{
1350 dSTACKLEVEL; 1468 dSTACKLEVEL;
1351 1469
1352 /* sometimes transfer is only called to set idle_sp */ 1470 /* sometimes transfer is only called to set idle_sp */
1353 if (expect_false (!next)) 1471 if (expect_false (!prev))
1354 { 1472 {
1355 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1473 cctx_current->idle_sp = STACKLEVEL;
1356 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1474 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1357 } 1475 }
1358 else if (expect_true (prev != next)) 1476 else if (expect_true (prev != next))
1359 { 1477 {
1360 coro_cctx *prev__cctx; 1478 coro_cctx *cctx_prev;
1361 1479
1362 if (expect_false (prev->flags & CF_NEW)) 1480 if (expect_false (prev->flags & CF_NEW))
1363 { 1481 {
1364 /* create a new empty/source context */ 1482 /* create a new empty/source context */
1365 prev->cctx = cctx_new_empty ();
1366 prev->flags &= ~CF_NEW; 1483 prev->flags &= ~CF_NEW;
1367 prev->flags |= CF_RUNNING; 1484 prev->flags |= CF_RUNNING;
1368 } 1485 }
1369 1486
1370 prev->flags &= ~CF_RUNNING; 1487 prev->flags &= ~CF_RUNNING;
… …
1381 coro_setup (aTHX_ next); 1498 coro_setup (aTHX_ next);
1382 } 1499 }
1383 else 1500 else
1384 load_perl (aTHX_ next); 1501 load_perl (aTHX_ next);
1385 1502
1386 prev__cctx = prev->cctx;
1387
1388 /* possibly untie and reuse the cctx */ 1503 /* possibly untie and reuse the cctx */
1389 if (expect_true ( 1504 if (expect_true (
1390 prev__cctx->idle_sp == STACKLEVEL 1505 cctx_current->idle_sp == STACKLEVEL
1391 && !(prev__cctx->flags & CC_TRACE) 1506 && !(cctx_current->flags & CC_TRACE)
1392 && !force_cctx 1507 && !force_cctx
1393 )) 1508 ))
1394 { 1509 {
1395 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1510 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1396 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1511 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1397 1512
1398 prev->cctx = 0;
1399
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1513 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1401 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1514 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1515 if (expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (!next->cctx) 1516 if (expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1517 next->cctx = cctx_get (aTHX);
1405 1518
1406 cctx_put (prev__cctx); 1519 cctx_put (cctx_current);
1407 } 1520 }
1521 else
1522 prev->cctx = cctx_current;
1408 1523
1409 ++next->usecount; 1524 ++next->usecount;
1410 1525
1411 if (expect_true (!next->cctx)) 1526 cctx_prev = cctx_current;
1412 next->cctx = cctx_get (aTHX); 1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1413 1528
1414 if (expect_false (prev__cctx != next->cctx)) 1529 next->cctx = 0;
1530
1531 if (expect_false (cctx_prev != cctx_current))
1415 { 1532 {
1416 prev__cctx->top_env = PL_top_env; 1533 cctx_prev->top_env = PL_top_env;
1417 PL_top_env = next->cctx->top_env; 1534 PL_top_env = cctx_current->top_env;
1418 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1419 } 1536 }
1420 1537
1421 transfer_tail (aTHX); 1538 transfer_tail (aTHX);
1422 } 1539 }
1423} 1540}
… …
1431coro_state_destroy (pTHX_ struct coro *coro) 1548coro_state_destroy (pTHX_ struct coro *coro)
1432{ 1549{
1433 if (coro->flags & CF_DESTROYED) 1550 if (coro->flags & CF_DESTROYED)
1434 return 0; 1551 return 0;
1435 1552
1436 if (coro->on_destroy) 1553 if (coro->on_destroy && !PL_dirty)
1437 coro->on_destroy (aTHX_ coro); 1554 coro->on_destroy (aTHX_ coro);
1438 1555
1439 coro->flags |= CF_DESTROYED; 1556 coro->flags |= CF_DESTROYED;
1440 1557
1441 if (coro->flags & CF_READY) 1558 if (coro->flags & CF_READY)
… …
1445 --coro_nready; 1562 --coro_nready;
1446 } 1563 }
1447 else 1564 else
1448 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1565 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1449 1566
1450 if (coro->mainstack && coro->mainstack != main_mainstack) 1567 if (coro->mainstack
1451 { 1568 && coro->mainstack != main_mainstack
1452 struct coro temp; 1569 && coro->slot
1453 1570 && !PL_dirty)
1454 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1455
1456 save_perl (aTHX_ &temp);
1457 load_perl (aTHX_ coro);
1458
1459 coro_destruct (aTHX_ coro); 1571 coro_destruct_perl (aTHX_ coro);
1460
1461 load_perl (aTHX_ &temp);
1462
1463 coro->slot = 0;
1464 }
1465 1572
1466 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1467 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1468 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1469 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
… …
1528 1635
1529 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1530 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1531} 1638}
1532 1639
1533/*****************************************************************************/
1534/* gensub: simple closure generation utility */
1535
1536#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1537
1538/* create a closure from XS, returns a code reference */
1539/* the arg can be accessed via GENSUB_ARG from the callback */
1540/* the callback must use dXSARGS/XSRETURN */
1541static SV *
1542gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1543{
1544 CV *cv = (CV *)newSV (0);
1545
1546 sv_upgrade ((SV *)cv, SVt_PVCV);
1547
1548 CvANON_on (cv);
1549 CvISXSUB_on (cv);
1550 CvXSUB (cv) = xsub;
1551 GENSUB_ARG = arg;
1552
1553 return newRV_noinc ((SV *)cv);
1554}
1555
1556/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1557 1641
1558INLINE void 1642INLINE void
1559coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1560{ 1644{
1561 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1562}
1563 1646
1564INLINE SV * 1647 SvREFCNT_inc_NN (coro->hv);
1648
1649 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro;
1652}
1653
1654INLINE struct coro *
1565coro_deq (pTHX) 1655coro_deq (pTHX)
1566{ 1656{
1567 int prio; 1657 int prio;
1568 1658
1569 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1570 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1571 return av_shift (coro_ready [prio]); 1661 struct coro **ready = coro_ready [prio];
1662
1663 if (ready [0])
1664 {
1665 struct coro *coro = ready [0];
1666 ready [0] = coro->next_ready;
1667 return coro;
1668 }
1669 }
1572 1670
1573 return 0; 1671 return 0;
1672}
1673
1674static void
1675invoke_sv_ready_hook_helper (void)
1676{
1677 dTHX;
1678 dSP;
1679
1680 ENTER;
1681 SAVETMPS;
1682
1683 PUSHMARK (SP);
1684 PUTBACK;
1685 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1686
1687 FREETMPS;
1688 LEAVE;
1574} 1689}
1575 1690
1576static int 1691static int
1577api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1578{ 1693{
1579 struct coro *coro;
1580 SV *sv_hook;
1581 void (*xs_hook)(void);
1582
1583 if (SvROK (coro_sv))
1584 coro_sv = SvRV (coro_sv);
1585
1586 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1587 1695
1588 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1589 return 0; 1697 return 0;
1590 1698
1591 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1592 1700
1593 sv_hook = coro_nready ? 0 : coro_readyhook;
1594 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1595
1596 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1597 ++coro_nready;
1598 1702
1599 if (sv_hook) 1703 if (!coro_nready++)
1600 { 1704 if (coroapi.readyhook)
1601 dSP; 1705 coroapi.readyhook ();
1602
1603 ENTER;
1604 SAVETMPS;
1605
1606 PUSHMARK (SP);
1607 PUTBACK;
1608 call_sv (sv_hook, G_VOID | G_DISCARD);
1609
1610 FREETMPS;
1611 LEAVE;
1612 }
1613
1614 if (xs_hook)
1615 xs_hook ();
1616 1706
1617 return 1; 1707 return 1;
1618} 1708}
1619 1709
1620static int 1710static int
… …
1643static void 1733static void
1644prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1734prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1645{ 1735{
1646 for (;;) 1736 for (;;)
1647 { 1737 {
1648 SV *next_sv = coro_deq (aTHX); 1738 struct coro *next = coro_deq (aTHX);
1649 1739
1650 if (expect_true (next_sv)) 1740 if (expect_true (next))
1651 { 1741 {
1652 struct coro *next = SvSTATE_hv (next_sv);
1653
1654 /* cannot transfer to destroyed coros, skip and look for next */ 1742 /* cannot transfer to destroyed coros, skip and look for next */
1655 if (expect_false (next->flags & CF_DESTROYED)) 1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1656 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1744 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1657 else 1745 else
1658 { 1746 {
1659 next->flags &= ~CF_READY; 1747 next->flags &= ~CF_READY;
1660 --coro_nready; 1748 --coro_nready;
1661 1749
1662 return prepare_schedule_to (aTHX_ ta, next); 1750 prepare_schedule_to (aTHX_ ta, next);
1751 break;
1663 } 1752 }
1664 } 1753 }
1665 else 1754 else
1666 { 1755 {
1667 /* nothing to schedule: call the idle handler */ 1756 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle)))
1759 {
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready;
1763 }
1764 else
1765 {
1668 dSP; 1766 dSP;
1669 1767
1670 ENTER; 1768 ENTER;
1671 SAVETMPS; 1769 SAVETMPS;
1672 1770
1673 PUSHMARK (SP); 1771 PUSHMARK (SP);
1674 PUTBACK; 1772 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1773 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1774
1677 FREETMPS; 1775 FREETMPS;
1678 LEAVE; 1776 LEAVE;
1777 }
1679 } 1778 }
1680 } 1779 }
1681} 1780}
1682 1781
1683INLINE void 1782INLINE void
… …
1754static void 1853static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1855{
1757 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1758 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1759 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1760 { 1862 {
1761 if (!coro->cctx) 1863 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 1867
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 1869 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 1871 {
… …
1825 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1927 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1826 api_ready (aTHX_ sv_manager); 1928 api_ready (aTHX_ sv_manager);
1827 1929
1828 frame->prepare = prepare_schedule; 1930 frame->prepare = prepare_schedule;
1829 frame->check = slf_check_repeat; 1931 frame->check = slf_check_repeat;
1932
1933 /* as a minor optimisation, we could unwind all stacks here */
1934 /* but that puts extra pressure on pp_slf, and is not worth much */
1935 /*coro_unwind_stacks (aTHX);*/
1830} 1936}
1831 1937
1832/*****************************************************************************/ 1938/*****************************************************************************/
1833/* async pool handler */ 1939/* async pool handler */
1834 1940
… …
1912 2018
1913static void 2019static void
1914coro_rouse_callback (pTHX_ CV *cv) 2020coro_rouse_callback (pTHX_ CV *cv)
1915{ 2021{
1916 dXSARGS; 2022 dXSARGS;
1917 SV *data = (SV *)GENSUB_ARG; 2023 SV *data = (SV *)S_GENSUB_ARG;
1918 2024
1919 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2025 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1920 { 2026 {
1921 /* first call, set args */ 2027 /* first call, set args */
2028 SV *coro = SvRV (data);
1922 AV *av = newAV (); 2029 AV *av = newAV ();
1923 SV *coro = SvRV (data);
1924 2030
1925 SvRV_set (data, (SV *)av); 2031 SvRV_set (data, (SV *)av);
1926 api_ready (aTHX_ coro);
1927 SvREFCNT_dec (coro);
1928 2032
1929 /* better take a full copy of the arguments */ 2033 /* better take a full copy of the arguments */
1930 while (items--) 2034 while (items--)
1931 av_store (av, items, newSVsv (ST (items))); 2035 av_store (av, items, newSVsv (ST (items)));
2036
2037 api_ready (aTHX_ coro);
2038 SvREFCNT_dec (coro);
1932 } 2039 }
1933 2040
1934 XSRETURN_EMPTY; 2041 XSRETURN_EMPTY;
1935} 2042}
1936 2043
… …
1953 2060
1954 EXTEND (SP, AvFILLp (av) + 1); 2061 EXTEND (SP, AvFILLp (av) + 1);
1955 for (i = 0; i <= AvFILLp (av); ++i) 2062 for (i = 0; i <= AvFILLp (av); ++i)
1956 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2063 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1957 2064
1958 /* we have stolen the elements, so ste length to zero and free */ 2065 /* we have stolen the elements, so set length to zero and free */
1959 AvFILLp (av) = -1; 2066 AvFILLp (av) = -1;
1960 av_undef (av); 2067 av_undef (av);
1961 2068
1962 PUTBACK; 2069 PUTBACK;
1963 } 2070 }
… …
1987 || SvTYPE (SvRV (cb)) != SVt_PVCV 2094 || SvTYPE (SvRV (cb)) != SVt_PVCV
1988 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1989 croak ("Coro::rouse_wait called with illegal callback argument,"); 2096 croak ("Coro::rouse_wait called with illegal callback argument,");
1990 2097
1991 { 2098 {
1992 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1993 SV *data = (SV *)GENSUB_ARG; 2100 SV *data = (SV *)S_GENSUB_ARG;
1994 2101
1995 frame->data = (void *)data; 2102 frame->data = (void *)data;
1996 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2103 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1997 frame->check = slf_check_rouse_wait; 2104 frame->check = slf_check_rouse_wait;
1998 } 2105 }
… …
2002coro_new_rouse_cb (pTHX) 2109coro_new_rouse_cb (pTHX)
2003{ 2110{
2004 HV *hv = (HV *)SvRV (coro_current); 2111 HV *hv = (HV *)SvRV (coro_current);
2005 struct coro *coro = SvSTATE_hv (hv); 2112 struct coro *coro = SvSTATE_hv (hv);
2006 SV *data = newRV_inc ((SV *)hv); 2113 SV *data = newRV_inc ((SV *)hv);
2007 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2114 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2008 2115
2009 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2116 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2010 SvREFCNT_dec (data); /* magicext increases the refcount */ 2117 SvREFCNT_dec (data); /* magicext increases the refcount */
2011 2118
2012 SvREFCNT_dec (coro->rouse_cb); 2119 SvREFCNT_dec (coro->rouse_cb);
… …
2250 } 2357 }
2251 else 2358 else
2252 slf_argc = 0; 2359 slf_argc = 0;
2253 2360
2254 PL_op->op_ppaddr = pp_slf; 2361 PL_op->op_ppaddr = pp_slf;
2255 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2362 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2363
2257 PL_op = (OP *)&slf_restore; 2364 PL_op = (OP *)&slf_restore;
2365}
2366
2367/*****************************************************************************/
2368/* dynamic wind */
2369
2370static void
2371on_enterleave_call (pTHX_ SV *cb)
2372{
2373 dSP;
2374
2375 PUSHSTACK;
2376
2377 PUSHMARK (SP);
2378 PUTBACK;
2379 call_sv (cb, G_VOID | G_DISCARD);
2380 SPAGAIN;
2381
2382 POPSTACK;
2383}
2384
2385static SV *
2386coro_avp_pop_and_free (pTHX_ AV **avp)
2387{
2388 AV *av = *avp;
2389 SV *res = av_pop (av);
2390
2391 if (AvFILLp (av) < 0)
2392 {
2393 *avp = 0;
2394 SvREFCNT_dec (av);
2395 }
2396
2397 return res;
2398}
2399
2400static void
2401coro_pop_on_enter (pTHX_ void *coro)
2402{
2403 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2404 SvREFCNT_dec (cb);
2405}
2406
2407static void
2408coro_pop_on_leave (pTHX_ void *coro)
2409{
2410 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2411 on_enterleave_call (aTHX_ sv_2mortal (cb));
2258} 2412}
2259 2413
2260/*****************************************************************************/ 2414/*****************************************************************************/
2261/* PerlIO::cede */ 2415/* PerlIO::cede */
2262 2416
… …
2336/* Coro::Semaphore & Coro::Signal */ 2490/* Coro::Semaphore & Coro::Signal */
2337 2491
2338static SV * 2492static SV *
2339coro_waitarray_new (pTHX_ int count) 2493coro_waitarray_new (pTHX_ int count)
2340{ 2494{
2341 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2495 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2342 AV *av = newAV (); 2496 AV *av = newAV ();
2343 SV **ary; 2497 SV **ary;
2344 2498
2345 /* unfortunately, building manually saves memory */ 2499 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2500 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2501 AvALLOC (av) = ary;
2502#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2503 AvARRAY (av) = ary;
2504#else
2349 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2505 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2506 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2507 SvPVX ((SV *)av) = (char *)ary;
2508#endif
2350 AvMAX (av) = 1; 2509 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2510 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2511 ary [0] = newSViv (count);
2353 2512
2354 return newRV_noinc ((SV *)av); 2513 return newRV_noinc ((SV *)av);
… …
2483{ 2642{
2484 if (items >= 2) 2643 if (items >= 2)
2485 { 2644 {
2486 /* callback form */ 2645 /* callback form */
2487 AV *av = (AV *)SvRV (arg [0]); 2646 AV *av = (AV *)SvRV (arg [0]);
2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2647 SV *cb_cv = s_get_cv_croak (arg [1]);
2489 2648
2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2649 av_push (av, SvREFCNT_inc_NN (cb_cv));
2491 2650
2492 if (SvIVX (AvARRAY (av)[0]) > 0) 2651 if (SvIVX (AvARRAY (av)[0]) > 0)
2493 coro_semaphore_adjust (aTHX_ av, 0); 2652 coro_semaphore_adjust (aTHX_ av, 0);
2494 2653
2495 frame->prepare = prepare_nop; 2654 frame->prepare = prepare_nop;
… …
2519 AvARRAY (av)[0] = AvARRAY (av)[1]; 2678 AvARRAY (av)[0] = AvARRAY (av)[1];
2520 AvARRAY (av)[1] = cb; 2679 AvARRAY (av)[1] = cb;
2521 2680
2522 cb = av_shift (av); 2681 cb = av_shift (av);
2523 2682
2683 if (SvTYPE (cb) == SVt_PVCV)
2684 {
2685 dSP;
2686 PUSHMARK (SP);
2687 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2688 PUTBACK;
2689 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2690 }
2691 else
2692 {
2524 api_ready (aTHX_ cb); 2693 api_ready (aTHX_ cb);
2525 sv_setiv (cb, 0); /* signal waiter */ 2694 sv_setiv (cb, 0); /* signal waiter */
2695 }
2696
2526 SvREFCNT_dec (cb); 2697 SvREFCNT_dec (cb);
2527 2698
2528 --count; 2699 --count;
2529 } 2700 }
2530} 2701}
… …
2539static void 2710static void
2540slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2711slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2541{ 2712{
2542 AV *av = (AV *)SvRV (arg [0]); 2713 AV *av = (AV *)SvRV (arg [0]);
2543 2714
2715 if (items >= 2)
2716 {
2717 SV *cb_cv = s_get_cv_croak (arg [1]);
2718 av_push (av, SvREFCNT_inc_NN (cb_cv));
2719
2544 if (SvIVX (AvARRAY (av)[0])) 2720 if (SvIVX (AvARRAY (av)[0]))
2721 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2722
2723 frame->prepare = prepare_nop;
2724 frame->check = slf_check_nop;
2725 }
2726 else if (SvIVX (AvARRAY (av)[0]))
2545 { 2727 {
2546 SvIVX (AvARRAY (av)[0]) = 0; 2728 SvIVX (AvARRAY (av)[0]) = 0;
2547 frame->prepare = prepare_nop; 2729 frame->prepare = prepare_nop;
2548 frame->check = slf_check_nop; 2730 frame->check = slf_check_nop;
2549 } 2731 }
2550 else 2732 else
2551 { 2733 {
2552 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2734 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2553 2735
2554 av_push (av, waiter); 2736 av_push (av, waiter);
2555 2737
2556 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2738 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2557 frame->prepare = prepare_schedule; 2739 frame->prepare = prepare_schedule;
… …
2575 2757
2576static void 2758static void
2577coro_aio_callback (pTHX_ CV *cv) 2759coro_aio_callback (pTHX_ CV *cv)
2578{ 2760{
2579 dXSARGS; 2761 dXSARGS;
2580 AV *state = (AV *)GENSUB_ARG; 2762 AV *state = (AV *)S_GENSUB_ARG;
2581 SV *coro = av_pop (state); 2763 SV *coro = av_pop (state);
2582 SV *data_sv = newSV (sizeof (struct io_state)); 2764 SV *data_sv = newSV (sizeof (struct io_state));
2583 2765
2584 av_extend (state, items - 1); 2766 av_extend (state, items - 1);
2585 2767
… …
2699 2881
2700 for (i = 0; i < items; ++i) 2882 for (i = 0; i < items; ++i)
2701 PUSHs (arg [i]); 2883 PUSHs (arg [i]);
2702 2884
2703 /* now push the callback closure */ 2885 /* now push the callback closure */
2704 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2886 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2705 2887
2706 /* now call the AIO function - we assume our request is uncancelable */ 2888 /* now call the AIO function - we assume our request is uncancelable */
2707 PUTBACK; 2889 PUTBACK;
2708 call_sv ((SV *)req, G_VOID | G_DISCARD); 2890 call_sv ((SV *)req, G_VOID | G_DISCARD);
2709 } 2891 }
… …
2723 2905
2724 XSRETURN_EMPTY; 2906 XSRETURN_EMPTY;
2725} 2907}
2726 2908
2727/*****************************************************************************/ 2909/*****************************************************************************/
2910
2911#if CORO_CLONE
2912# include "clone.c"
2913#endif
2728 2914
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2915MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 2916
2731PROTOTYPES: DISABLE 2917PROTOTYPES: DISABLE
2732 2918
… …
2737 coro_thx = PERL_GET_CONTEXT; 2923 coro_thx = PERL_GET_CONTEXT;
2738# endif 2924# endif
2739#endif 2925#endif
2740 BOOT_PAGESIZE; 2926 BOOT_PAGESIZE;
2741 2927
2928 cctx_current = cctx_new_empty ();
2929
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2930 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2931 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 2932
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2933 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2746 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2934 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2765 2953
2766 { 2954 {
2767 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2955 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2768 2956
2769 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2957 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2770 hv_store_ent (PL_custom_op_names, slf, 2958 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2771 newSVpv ("coro_slf", 0), 0);
2772 2959
2773 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2960 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2774 hv_store_ent (PL_custom_op_descs, slf, 2961 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2775 newSVpv ("coro schedule like function", 0), 0);
2776 } 2962 }
2777 2963
2778 coroapi.ver = CORO_API_VERSION; 2964 coroapi.ver = CORO_API_VERSION;
2779 coroapi.rev = CORO_API_REVISION; 2965 coroapi.rev = CORO_API_REVISION;
2780 2966
… …
2792 2978
2793 if (!svp) croak ("Time::HiRes is required"); 2979 if (!svp) croak ("Time::HiRes is required");
2794 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2795 2981
2796 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2982 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2983
2984 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2985 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2797 } 2986 }
2798 2987
2799 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2800} 2989}
2801 2990
2802SV * 2991SV *
2803new (char *klass, ...) 2992new (char *klass, ...)
2804 ALIAS: 2993 ALIAS:
… …
2806 CODE: 2995 CODE:
2807{ 2996{
2808 struct coro *coro; 2997 struct coro *coro;
2809 MAGIC *mg; 2998 MAGIC *mg;
2810 HV *hv; 2999 HV *hv;
2811 CV *cb; 3000 SV *cb;
2812 int i; 3001 int i;
2813 3002
2814 if (items > 1) 3003 if (items > 1)
2815 { 3004 {
2816 cb = coro_sv_2cv (aTHX_ ST (1)); 3005 cb = s_get_cv_croak (ST (1));
2817 3006
2818 if (!ix) 3007 if (!ix)
2819 { 3008 {
2820 if (CvISXSUB (cb)) 3009 if (CvISXSUB (cb))
2821 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3010 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2843 av_extend (coro->args, items - 1 + ix - 1); 3032 av_extend (coro->args, items - 1 + ix - 1);
2844 3033
2845 if (ix) 3034 if (ix)
2846 { 3035 {
2847 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2848 cb = cv_coro_run; 3037 cb = (SV *)cv_coro_run;
2849 } 3038 }
2850 3039
2851 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2852 3041
2853 for (i = 2; i < items; i++) 3042 for (i = 2; i < items; i++)
… …
2873void 3062void
2874_exit (int code) 3063_exit (int code)
2875 PROTOTYPE: $ 3064 PROTOTYPE: $
2876 CODE: 3065 CODE:
2877 _exit (code); 3066 _exit (code);
3067
3068SV *
3069clone (Coro::State coro)
3070 CODE:
3071{
3072#if CORO_CLONE
3073 struct coro *ncoro = coro_clone (aTHX_ coro);
3074 MAGIC *mg;
3075 /* TODO: too much duplication */
3076 ncoro->hv = newHV ();
3077 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3078 mg->mg_flags |= MGf_DUP;
3079 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3080#else
3081 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3082#endif
3083}
3084 OUTPUT:
3085 RETVAL
2878 3086
2879int 3087int
2880cctx_stacksize (int new_stacksize = 0) 3088cctx_stacksize (int new_stacksize = 0)
2881 PROTOTYPE: ;$ 3089 PROTOTYPE: ;$
2882 CODE: 3090 CODE:
… …
2932 eval = 1 3140 eval = 1
2933 CODE: 3141 CODE:
2934{ 3142{
2935 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2936 { 3144 {
2937 struct coro temp; 3145 struct coro *current = SvSTATE_current;
2938 3146
2939 if (!(coro->flags & CF_RUNNING)) 3147 if (current != coro)
2940 { 3148 {
2941 PUTBACK; 3149 PUTBACK;
2942 save_perl (aTHX_ &temp); 3150 save_perl (aTHX_ current);
2943 load_perl (aTHX_ coro); 3151 load_perl (aTHX_ coro);
3152 SPAGAIN;
2944 } 3153 }
2945 3154
2946 {
2947 dSP;
2948 ENTER;
2949 SAVETMPS;
2950 PUTBACK;
2951 PUSHSTACK; 3155 PUSHSTACK;
3156
2952 PUSHMARK (SP); 3157 PUSHMARK (SP);
3158 PUTBACK;
2953 3159
2954 if (ix) 3160 if (ix)
2955 eval_sv (coderef, 0); 3161 eval_sv (coderef, 0);
2956 else 3162 else
2957 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3163 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2958 3164
2959 POPSTACK; 3165 POPSTACK;
2960 SPAGAIN; 3166 SPAGAIN;
2961 FREETMPS;
2962 LEAVE;
2963 PUTBACK;
2964 }
2965 3167
2966 if (!(coro->flags & CF_RUNNING)) 3168 if (current != coro)
2967 { 3169 {
3170 PUTBACK;
2968 save_perl (aTHX_ coro); 3171 save_perl (aTHX_ coro);
2969 load_perl (aTHX_ &temp); 3172 load_perl (aTHX_ current);
2970 SPAGAIN; 3173 SPAGAIN;
2971 } 3174 }
2972 } 3175 }
2973} 3176}
2974 3177
… …
2978 ALIAS: 3181 ALIAS:
2979 is_ready = CF_READY 3182 is_ready = CF_READY
2980 is_running = CF_RUNNING 3183 is_running = CF_RUNNING
2981 is_new = CF_NEW 3184 is_new = CF_NEW
2982 is_destroyed = CF_DESTROYED 3185 is_destroyed = CF_DESTROYED
3186 is_suspended = CF_SUSPENDED
2983 CODE: 3187 CODE:
2984 RETVAL = boolSV (coro->flags & ix); 3188 RETVAL = boolSV (coro->flags & ix);
2985 OUTPUT: 3189 OUTPUT:
2986 RETVAL 3190 RETVAL
2987 3191
… …
2991 CODE: 3195 CODE:
2992{ 3196{
2993 struct coro *current = SvSTATE_current; 3197 struct coro *current = SvSTATE_current;
2994 SV **throwp = self == current ? &CORO_THROW : &self->except; 3198 SV **throwp = self == current ? &CORO_THROW : &self->except;
2995 SvREFCNT_dec (*throwp); 3199 SvREFCNT_dec (*throwp);
3200 SvGETMAGIC (throw);
2996 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2997} 3202}
2998 3203
2999void 3204void
3000api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
3003 3208
3004SV * 3209SV *
3005has_cctx (Coro::State coro) 3210has_cctx (Coro::State coro)
3006 PROTOTYPE: $ 3211 PROTOTYPE: $
3007 CODE: 3212 CODE:
3008 RETVAL = boolSV (!!coro->cctx); 3213 /* maybe manage the running flag differently */
3214 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3009 OUTPUT: 3215 OUTPUT:
3010 RETVAL 3216 RETVAL
3011 3217
3012int 3218int
3013is_traced (Coro::State coro) 3219is_traced (Coro::State coro)
… …
3033 3239
3034void 3240void
3035force_cctx () 3241force_cctx ()
3036 PROTOTYPE: 3242 PROTOTYPE:
3037 CODE: 3243 CODE:
3038 SvSTATE_current->cctx->idle_sp = 0; 3244 cctx_current->idle_sp = 0;
3039 3245
3040void 3246void
3041swap_defsv (Coro::State self) 3247swap_defsv (Coro::State self)
3042 PROTOTYPE: $ 3248 PROTOTYPE: $
3043 ALIAS: 3249 ALIAS:
… …
3051 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3257 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3052 3258
3053 SV *tmp = *src; *src = *dst; *dst = tmp; 3259 SV *tmp = *src; *src = *dst; *dst = tmp;
3054 } 3260 }
3055 3261
3262void
3263cancel (Coro::State self)
3264 CODE:
3265 coro_state_destroy (aTHX_ self);
3266 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3267
3268
3269SV *
3270enable_times (int enabled = enable_times)
3271 CODE:
3272{
3273 RETVAL = boolSV (enable_times);
3274
3275 if (enabled != enable_times)
3276 {
3277 enable_times = enabled;
3278
3279 coro_times_update ();
3280 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3281 }
3282}
3283 OUTPUT:
3284 RETVAL
3285
3286void
3287times (Coro::State self)
3288 PPCODE:
3289{
3290 struct coro *current = SvSTATE (coro_current);
3291
3292 if (expect_false (current == self))
3293 {
3294 coro_times_update ();
3295 coro_times_add (SvSTATE (coro_current));
3296 }
3297
3298 EXTEND (SP, 2);
3299 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3300 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3301
3302 if (expect_false (current == self))
3303 coro_times_sub (SvSTATE (coro_current));
3304}
3056 3305
3057MODULE = Coro::State PACKAGE = Coro 3306MODULE = Coro::State PACKAGE = Coro
3058 3307
3059BOOT: 3308BOOT:
3060{ 3309{
3061 int i;
3062
3063 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3064 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3065 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3066 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3067 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3314 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3068 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3069 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3070 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3317 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3318 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3071 3319
3072 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3320 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3073 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3074 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3322 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3075 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3323 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3076 3324
3077 coro_stash = gv_stashpv ("Coro", TRUE); 3325 coro_stash = gv_stashpv ("Coro", TRUE);
3078 3326
3079 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3080 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3081 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3329 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3082 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3330 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3083 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3331 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3084 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3332 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3085
3086 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3087 coro_ready[i] = newAV ();
3088 3333
3089 { 3334 {
3090 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3335 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3091 3336
3092 coroapi.schedule = api_schedule; 3337 coroapi.schedule = api_schedule;
… …
3133cede_notself (...) 3378cede_notself (...)
3134 CODE: 3379 CODE:
3135 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3380 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3136 3381
3137void 3382void
3138_cancel (Coro::State self)
3139 CODE:
3140 coro_state_destroy (aTHX_ self);
3141 coro_call_on_destroy (aTHX_ self);
3142
3143void
3144_set_current (SV *current) 3383_set_current (SV *current)
3145 PROTOTYPE: $ 3384 PROTOTYPE: $
3146 CODE: 3385 CODE:
3147 SvREFCNT_dec (SvRV (coro_current)); 3386 SvREFCNT_dec (SvRV (coro_current));
3148 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3387 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
… …
3150void 3389void
3151_set_readyhook (SV *hook) 3390_set_readyhook (SV *hook)
3152 PROTOTYPE: $ 3391 PROTOTYPE: $
3153 CODE: 3392 CODE:
3154 SvREFCNT_dec (coro_readyhook); 3393 SvREFCNT_dec (coro_readyhook);
3394 SvGETMAGIC (hook);
3395 if (SvOK (hook))
3396 {
3155 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3397 coro_readyhook = newSVsv (hook);
3398 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3399 }
3400 else
3401 {
3402 coro_readyhook = 0;
3403 CORO_READYHOOK = 0;
3404 }
3156 3405
3157int 3406int
3158prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3159 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3160 ALIAS: 3409 ALIAS:
… …
3166 if (items > 1) 3415 if (items > 1)
3167 { 3416 {
3168 if (ix) 3417 if (ix)
3169 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3170 3419
3171 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3172 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3173 3422
3174 coro->prio = newprio; 3423 coro->prio = newprio;
3175 } 3424 }
3176} 3425}
3177 OUTPUT: 3426 OUTPUT:
… …
3190 PROTOTYPE: 3439 PROTOTYPE:
3191 CODE: 3440 CODE:
3192 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3193 OUTPUT: 3442 OUTPUT:
3194 RETVAL 3443 RETVAL
3444
3445void
3446suspend (Coro::State self)
3447 PROTOTYPE: $
3448 CODE:
3449 self->flags |= CF_SUSPENDED;
3450
3451void
3452resume (Coro::State self)
3453 PROTOTYPE: $
3454 CODE:
3455 self->flags &= ~CF_SUSPENDED;
3195 3456
3196void 3457void
3197_pool_handler (...) 3458_pool_handler (...)
3198 CODE: 3459 CODE:
3199 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
… …
3254rouse_wait (...) 3515rouse_wait (...)
3255 PROTOTYPE: ;$ 3516 PROTOTYPE: ;$
3256 PPCODE: 3517 PPCODE:
3257 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3258 3519
3520void
3521on_enter (SV *block)
3522 ALIAS:
3523 on_leave = 1
3524 PROTOTYPE: &
3525 CODE:
3526{
3527 struct coro *coro = SvSTATE_current;
3528 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3529
3530 block = s_get_cv_croak (block);
3531
3532 if (!*avp)
3533 *avp = newAV ();
3534
3535 av_push (*avp, SvREFCNT_inc (block));
3536
3537 if (!ix)
3538 on_enterleave_call (aTHX_ block);
3539
3540 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3541 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3542 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3543}
3544
3259 3545
3260MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3261 3547
3262BOOT: 3548BOOT:
3263 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3549 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3266MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3267 3553
3268SV * 3554SV *
3269new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3270 CODE: 3556 CODE:
3557{
3558 int semcnt = 1;
3559
3560 if (count)
3561 {
3562 SvGETMAGIC (count);
3563
3564 if (SvOK (count))
3565 semcnt = SvIV (count);
3566 }
3567
3271 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3272 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3273 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3274 ); 3571 );
3572}
3275 OUTPUT: 3573 OUTPUT:
3276 RETVAL 3574 RETVAL
3277 3575
3278# helper for Coro::Channel 3576# helper for Coro::Channel and others
3279SV * 3577SV *
3280_alloc (int count) 3578_alloc (int count)
3281 CODE: 3579 CODE:
3282 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3283 OUTPUT: 3581 OUTPUT:
… …
3341 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3342 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3343 } 3641 }
3344} 3642}
3345 3643
3644MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3645
3646void
3647_may_delete (SV *sem, int count, int extra_refs)
3648 PPCODE:
3649{
3650 AV *av = (AV *)SvRV (sem);
3651
3652 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3653 && AvFILLp (av) == 0 /* no waiters, just count */
3654 && SvIV (AvARRAY (av)[0]) == count)
3655 XSRETURN_YES;
3656
3657 XSRETURN_NO;
3658}
3659
3346MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3347 3661
3348SV * 3662SV *
3349new (SV *klass) 3663new (SV *klass)
3350 CODE: 3664 CODE:
… …
3421 3735
3422void 3736void
3423_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3424 CODE: 3738 CODE:
3425{ 3739{
3426 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3427 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3428 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3429 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3430 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3744 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3431} 3745}
3432 3746
3747MODULE = Coro::State PACKAGE = Coro::Select
3748
3749void
3750patch_pp_sselect ()
3751 CODE:
3752 if (!coro_old_pp_sselect)
3753 {
3754 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3755 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3756 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3757 }
3758
3759void
3760unpatch_pp_sselect ()
3761 CODE:
3762 if (coro_old_pp_sselect)
3763 {
3764 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3765 coro_old_pp_sselect = 0;
3766 }
3767
3768

Diff Legend

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