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.323 by root, Sat Nov 22 06:03:10 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#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
133#else 74#else
134# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
136#endif 77#endif
137 78
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 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
164static 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]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
175static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 129
178static AV *av_destroy; /* destruction queue */ 130static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
180 133
181static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 136static SV *rv_diehook;
184static SV *rv_warnhook; 137static SV *rv_warnhook;
194static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
195 148
196/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
197static SV *sv_activity; 150static SV *sv_activity;
198 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
199static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
201 160
202enum { 161enum {
203 CC_MAPPED = 0x01, 162 CC_MAPPED = 0x01,
237enum { 196enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
241 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 */
242}; 202};
243 203
244/* 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 */
245typedef struct 205typedef struct
246{ 206{
247 SV *defsv; 207 SV *defsv;
248 AV *defav; 208 AV *defav;
249 SV *errsv; 209 SV *errsv;
250 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
251#define VAR(name,type) type name; 212#define VAR(name,type) type name;
252# include "state.h" 213# include "state.h"
253#undef VAR 214#undef VAR
254} perl_slots; 215} perl_slots;
255 216
257 218
258/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
259struct coro { 220struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
262 226
263 /* state data */ 227 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 229 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
283 /* async_pool */ 247 /* async_pool */
284 SV *saved_deffh; 248 SV *saved_deffh;
285 SV *invoke_cb; 249 SV *invoke_cb;
286 AV *invoke_av; 250 AV *invoke_av;
287 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
288 /* linked list */ 259 /* linked list */
289 struct coro *next, *prev; 260 struct coro *next, *prev;
290}; 261};
291 262
292typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
297/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
299 270
300/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
301 272
302#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
308 279
309/* for Coro.pm */ 280/* for Coro.pm */
310static SV *coro_current; 281static SV *coro_current;
311static SV *coro_readyhook; 282static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 285static struct coro *coro_first;
315#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}
316 307
317/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
318 309
319static SV * 310static SV *
320coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
344 get_hv (name, create); 335 get_hv (name, create);
345#endif 336#endif
346 return get_hv (name, create); 337 return get_hv (name, create);
347} 338}
348 339
349/* may croak */ 340INLINE void
350INLINE CV * 341coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 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{
353 HV *st; 409 HV *stash;
354 GV *gvp; 410 MAGIC *mg;
355 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;
356} 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 */
357 438
358static AV * 439static AV *
359coro_derive_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
360{ 441{
361 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 451#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 453 --AvFILLp (padlist);
373 454
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
376 457
377 return newpadlist; 458 return newpadlist;
378} 459}
379 460
380static void 461static void
381free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
382{ 463{
383 /* may be during global destruction */ 464 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
385 { 466 {
386 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
387 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
388 { 470 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
390 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 473 I32 j = AvFILLp (av);
392 SV *sv; 474
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 480 }
399 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
401 } 486 }
402} 487}
403 488
404static int 489static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 491{
407 AV *padlist; 492 AV *padlist;
408 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;
409 498
410 /* casting is fun. */ 499 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
413 502
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 504
416 return 0; 505 return 0;
417} 506}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 507
422static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 509 0, 0, 0, 0,
424 coro_cv_free 510 coro_cv_free
425}; 511};
426
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469 512
470/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
471static void 514static void
472get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
473{ 516{
501 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);
502 545
503 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
504 547
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
507 550
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 552}
510 553
511/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
512 558
513static void 559static void
514load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
515{ 561{
516 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
517 c->slot = 0; 563 c->slot = 0;
518 564
519 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
520 566
521 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
525 572
526 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 574 # include "state.h"
528 #undef VAR 575 #undef VAR
529 576
543 PUTBACK; 590 PUTBACK;
544 } 591 }
545 592
546 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
547 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 }
548} 611}
549 612
550static void 613static void
551save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
552{ 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
553 c->except = CORO_THROW; 632 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
555 634
556 { 635 {
557 dSP; 636 dSP;
570 { 649 {
571 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
572 { 651 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
574 653
575 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))
576 { 655 {
577 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
578 657
579 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
580 { 659 {
604 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
608 { 687 {
609 int i; 688 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 690 CXINC;
612 } 691 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 693
615 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
616 695
617 { 696 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 698
620 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
624 704
625 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 706 # include "state.h"
627 #undef VAR 707 #undef VAR
628 } 708 }
755#endif 835#endif
756 836
757/* 837/*
758 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
759 * 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
760 * 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
761 * readback here. 841 * readback here.
762 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
763 * not expecting this to actually change the hook. This is a potential problem
764 * when a schedule happens then, but we ignore this.
765 */ 842 */
766static int 843static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 845{
769 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 900
824 if (svp) 901 if (svp)
825 { 902 {
826 SV *old = *svp; 903 SV *old = *svp;
827 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
829 return 0; 906 return 0;
830 } 907 }
831 } 908 }
832 909
864 941
865 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 949 PL_curpm = 0;
870 PL_curpad = 0; 950 PL_curpad = 0;
871 PL_localizing = 0; 951 PL_localizing = 0;
872 PL_dirty = 0; 952 PL_dirty = 0;
873 PL_restartop = 0; 953 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 955 PL_parser = 0;
876#endif 956#endif
957 PL_hints = 0;
877 958
878 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
879 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 );
880 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);
881 962
882 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
885 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;
886 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 970
889 { 971 {
890 dSP; 972 dSP;
916 998
917 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
918 1000
919 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
920 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
921}
922 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
923static void 1011static void
924coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
925{ 1013{
926 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
927 { 1015 {
928 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
937 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
938 1026
939 /* unwind main stack */ 1027 /* unwind main stack */
940 dounwind (-1); 1028 dounwind (-1);
941 } 1029 }
1030}
942 1031
943 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
946 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1036
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 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
953 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
957 1073 }
958 coro_destruct_stacks (aTHX);
959} 1074}
960 1075
961INLINE void 1076INLINE void
962free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
963{ 1078{
1160 /* 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 */
1161 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1162 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1163 /* 1278 /*
1164 * 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
1165 * 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.
1166 */ 1282 */
1167 1283
1168 /* 1284 /*
1169 * 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
1170 * 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)
1171 * 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
1172 * bootstrap-time "top" top_env, as we cannot restore the "main" 1288 * bootstrap-time "top" top_env, as we cannot restore the "main"
1173 * 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.
1174 */ 1292 */
1175 PL_top_env = main_top_env; 1293 PL_top_env = main_top_env;
1176 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 */
1177 } 1295 }
1178} 1296}
1255cctx_destroy (coro_cctx *cctx) 1373cctx_destroy (coro_cctx *cctx)
1256{ 1374{
1257 if (!cctx) 1375 if (!cctx)
1258 return; 1376 return;
1259 1377
1260 assert (cctx != cctx_current);//D temporary 1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1261 1379
1262 --cctx_count; 1380 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1381 coro_destroy (&cctx->cctx);
1264 1382
1265 /* coro_transfer creates new, empty cctx's */ 1383 /* coro_transfer creates new, empty cctx's */
1329 /* TODO: throwing up here is considered harmful */ 1447 /* TODO: throwing up here is considered harmful */
1330 1448
1331 if (expect_true (prev != next)) 1449 if (expect_true (prev != next))
1332 { 1450 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1334 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,");
1335 1453
1336 if (expect_false (next->flags & CF_RUNNING))
1337 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1338
1339 if (expect_false (next->flags & CF_DESTROYED)) 1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1340 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,");
1341 1456
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1457#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1458 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1344 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,");
1345#endif 1460#endif
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 == cctx_current->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 /* 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. */
1399 /* 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 */
1400 if (expect_false (CCTX_EXPIRED (cctx_current))) 1515 if (expect_false (CCTX_EXPIRED (cctx_current)))
1401 if (!next->cctx) 1516 if (expect_true (!next->cctx))
1402 next->cctx = cctx_get (aTHX); 1517 next->cctx = cctx_get (aTHX);
1403 1518
1404 cctx_put (cctx_current); 1519 cctx_put (cctx_current);
1405 assert (!prev->cctx);//D temporary
1406 } 1520 }
1407 else 1521 else
1408 prev->cctx = cctx_current; 1522 prev->cctx = cctx_current;
1409 1523
1410 ++next->usecount; 1524 ++next->usecount;
1434coro_state_destroy (pTHX_ struct coro *coro) 1548coro_state_destroy (pTHX_ struct coro *coro)
1435{ 1549{
1436 if (coro->flags & CF_DESTROYED) 1550 if (coro->flags & CF_DESTROYED)
1437 return 0; 1551 return 0;
1438 1552
1439 if (coro->on_destroy) 1553 if (coro->on_destroy && !PL_dirty)
1440 coro->on_destroy (aTHX_ coro); 1554 coro->on_destroy (aTHX_ coro);
1441 1555
1442 coro->flags |= CF_DESTROYED; 1556 coro->flags |= CF_DESTROYED;
1443 1557
1444 if (coro->flags & CF_READY) 1558 if (coro->flags & CF_READY)
1448 --coro_nready; 1562 --coro_nready;
1449 } 1563 }
1450 else 1564 else
1451 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 */
1452 1566
1453 if (coro->mainstack && coro->mainstack != main_mainstack) 1567 if (coro->mainstack
1454 { 1568 && coro->mainstack != main_mainstack
1455 struct coro temp; 1569 && coro->slot
1456 1570 && !PL_dirty)
1457 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1458
1459 save_perl (aTHX_ &temp);
1460 load_perl (aTHX_ coro);
1461
1462 coro_destruct (aTHX_ coro); 1571 coro_destruct_perl (aTHX_ coro);
1463
1464 load_perl (aTHX_ &temp);
1465
1466 coro->slot = 0;
1467 }
1468 1572
1469 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1470 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1471 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1472 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
1531 1635
1532 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1533 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1534} 1638}
1535 1639
1536/*****************************************************************************/
1537/* gensub: simple closure generation utility */
1538
1539#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1540
1541/* create a closure from XS, returns a code reference */
1542/* the arg can be accessed via GENSUB_ARG from the callback */
1543/* the callback must use dXSARGS/XSRETURN */
1544static SV *
1545gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1546{
1547 CV *cv = (CV *)newSV (0);
1548
1549 sv_upgrade ((SV *)cv, SVt_PVCV);
1550
1551 CvANON_on (cv);
1552 CvISXSUB_on (cv);
1553 CvXSUB (cv) = xsub;
1554 GENSUB_ARG = arg;
1555
1556 return newRV_noinc ((SV *)cv);
1557}
1558
1559/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1560 1641
1561INLINE void 1642INLINE void
1562coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1563{ 1644{
1564 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1565}
1566 1646
1567INLINE 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 *
1568coro_deq (pTHX) 1655coro_deq (pTHX)
1569{ 1656{
1570 int prio; 1657 int prio;
1571 1658
1572 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1573 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1574 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 }
1575 1670
1576 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;
1577} 1689}
1578 1690
1579static int 1691static int
1580api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1581{ 1693{
1582 struct coro *coro;
1583 SV *sv_hook;
1584 void (*xs_hook)(void);
1585
1586 if (SvROK (coro_sv))
1587 coro_sv = SvRV (coro_sv);
1588
1589 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1590 1695
1591 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1592 return 0; 1697 return 0;
1593 1698
1594 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1595 1700
1596 sv_hook = coro_nready ? 0 : coro_readyhook;
1597 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1598
1599 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1600 ++coro_nready;
1601 1702
1602 if (sv_hook) 1703 if (!coro_nready++)
1603 { 1704 if (coroapi.readyhook)
1604 dSP; 1705 coroapi.readyhook ();
1605
1606 ENTER;
1607 SAVETMPS;
1608
1609 PUSHMARK (SP);
1610 PUTBACK;
1611 call_sv (sv_hook, G_VOID | G_DISCARD);
1612
1613 FREETMPS;
1614 LEAVE;
1615 }
1616
1617 if (xs_hook)
1618 xs_hook ();
1619 1706
1620 return 1; 1707 return 1;
1621} 1708}
1622 1709
1623static int 1710static int
1646static void 1733static void
1647prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1734prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1648{ 1735{
1649 for (;;) 1736 for (;;)
1650 { 1737 {
1651 SV *next_sv = coro_deq (aTHX); 1738 struct coro *next = coro_deq (aTHX);
1652 1739
1653 if (expect_true (next_sv)) 1740 if (expect_true (next))
1654 { 1741 {
1655 struct coro *next = SvSTATE_hv (next_sv);
1656
1657 /* cannot transfer to destroyed coros, skip and look for next */ 1742 /* cannot transfer to destroyed coros, skip and look for next */
1658 if (expect_false (next->flags & CF_DESTROYED)) 1743 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1659 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 */
1660 else 1745 else
1661 { 1746 {
1662 next->flags &= ~CF_READY; 1747 next->flags &= ~CF_READY;
1663 --coro_nready; 1748 --coro_nready;
1664 1749
1667 } 1752 }
1668 } 1753 }
1669 else 1754 else
1670 { 1755 {
1671 /* 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 {
1672 dSP; 1766 dSP;
1673 1767
1674 ENTER; 1768 ENTER;
1675 SAVETMPS; 1769 SAVETMPS;
1676 1770
1677 PUSHMARK (SP); 1771 PUSHMARK (SP);
1678 PUTBACK; 1772 PUTBACK;
1679 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1773 call_sv (sv_idle, G_VOID | G_DISCARD);
1680 1774
1681 FREETMPS; 1775 FREETMPS;
1682 LEAVE; 1776 LEAVE;
1777 }
1683 } 1778 }
1684 } 1779 }
1685} 1780}
1686 1781
1687INLINE void 1782INLINE void
1758static void 1853static void
1759api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1760{ 1855{
1761 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1762 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1763 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1764 { 1862 {
1765 if (!coro->cctx) 1863 if (!coro->cctx)
1766 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1767 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1768 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1769 1867
1770 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1771 } 1869 }
1772 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1773 { 1871 {
1829 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 */
1830 api_ready (aTHX_ sv_manager); 1928 api_ready (aTHX_ sv_manager);
1831 1929
1832 frame->prepare = prepare_schedule; 1930 frame->prepare = prepare_schedule;
1833 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);*/
1834} 1936}
1835 1937
1836/*****************************************************************************/ 1938/*****************************************************************************/
1837/* async pool handler */ 1939/* async pool handler */
1838 1940
1916 2018
1917static void 2019static void
1918coro_rouse_callback (pTHX_ CV *cv) 2020coro_rouse_callback (pTHX_ CV *cv)
1919{ 2021{
1920 dXSARGS; 2022 dXSARGS;
1921 SV *data = (SV *)GENSUB_ARG; 2023 SV *data = (SV *)S_GENSUB_ARG;
1922 2024
1923 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2025 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1924 { 2026 {
1925 /* first call, set args */ 2027 /* first call, set args */
2028 SV *coro = SvRV (data);
1926 AV *av = newAV (); 2029 AV *av = newAV ();
1927 SV *coro = SvRV (data);
1928 2030
1929 SvRV_set (data, (SV *)av); 2031 SvRV_set (data, (SV *)av);
1930 api_ready (aTHX_ coro);
1931 SvREFCNT_dec (coro);
1932 2032
1933 /* better take a full copy of the arguments */ 2033 /* better take a full copy of the arguments */
1934 while (items--) 2034 while (items--)
1935 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);
1936 } 2039 }
1937 2040
1938 XSRETURN_EMPTY; 2041 XSRETURN_EMPTY;
1939} 2042}
1940 2043
1957 2060
1958 EXTEND (SP, AvFILLp (av) + 1); 2061 EXTEND (SP, AvFILLp (av) + 1);
1959 for (i = 0; i <= AvFILLp (av); ++i) 2062 for (i = 0; i <= AvFILLp (av); ++i)
1960 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2063 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1961 2064
1962 /* 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 */
1963 AvFILLp (av) = -1; 2066 AvFILLp (av) = -1;
1964 av_undef (av); 2067 av_undef (av);
1965 2068
1966 PUTBACK; 2069 PUTBACK;
1967 } 2070 }
1991 || SvTYPE (SvRV (cb)) != SVt_PVCV 2094 || SvTYPE (SvRV (cb)) != SVt_PVCV
1992 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2095 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1993 croak ("Coro::rouse_wait called with illegal callback argument,"); 2096 croak ("Coro::rouse_wait called with illegal callback argument,");
1994 2097
1995 { 2098 {
1996 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2099 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1997 SV *data = (SV *)GENSUB_ARG; 2100 SV *data = (SV *)S_GENSUB_ARG;
1998 2101
1999 frame->data = (void *)data; 2102 frame->data = (void *)data;
2000 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2103 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2001 frame->check = slf_check_rouse_wait; 2104 frame->check = slf_check_rouse_wait;
2002 } 2105 }
2006coro_new_rouse_cb (pTHX) 2109coro_new_rouse_cb (pTHX)
2007{ 2110{
2008 HV *hv = (HV *)SvRV (coro_current); 2111 HV *hv = (HV *)SvRV (coro_current);
2009 struct coro *coro = SvSTATE_hv (hv); 2112 struct coro *coro = SvSTATE_hv (hv);
2010 SV *data = newRV_inc ((SV *)hv); 2113 SV *data = newRV_inc ((SV *)hv);
2011 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2114 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2012 2115
2013 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);
2014 SvREFCNT_dec (data); /* magicext increases the refcount */ 2117 SvREFCNT_dec (data); /* magicext increases the refcount */
2015 2118
2016 SvREFCNT_dec (coro->rouse_cb); 2119 SvREFCNT_dec (coro->rouse_cb);
2257 2360
2258 PL_op->op_ppaddr = pp_slf; 2361 PL_op->op_ppaddr = pp_slf;
2259 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2362 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2260 2363
2261 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));
2262} 2412}
2263 2413
2264/*****************************************************************************/ 2414/*****************************************************************************/
2265/* PerlIO::cede */ 2415/* PerlIO::cede */
2266 2416
2340/* Coro::Semaphore & Coro::Signal */ 2490/* Coro::Semaphore & Coro::Signal */
2341 2491
2342static SV * 2492static SV *
2343coro_waitarray_new (pTHX_ int count) 2493coro_waitarray_new (pTHX_ int count)
2344{ 2494{
2345 /* 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 */
2346 AV *av = newAV (); 2496 AV *av = newAV ();
2347 SV **ary; 2497 SV **ary;
2348 2498
2349 /* unfortunately, building manually saves memory */ 2499 /* unfortunately, building manually saves memory */
2350 Newx (ary, 2, SV *); 2500 Newx (ary, 2, SV *);
2351 AvALLOC (av) = ary; 2501 AvALLOC (av) = ary;
2502#if PERL_VERSION_ATLEAST (5,10,0)
2352 /*AvARRAY (av) = ary;*/ 2503 AvARRAY (av) = ary;
2504#else
2353 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
2354 AvMAX (av) = 1; 2509 AvMAX (av) = 1;
2355 AvFILLp (av) = 0; 2510 AvFILLp (av) = 0;
2356 ary [0] = newSViv (count); 2511 ary [0] = newSViv (count);
2357 2512
2358 return newRV_noinc ((SV *)av); 2513 return newRV_noinc ((SV *)av);
2487{ 2642{
2488 if (items >= 2) 2643 if (items >= 2)
2489 { 2644 {
2490 /* callback form */ 2645 /* callback form */
2491 AV *av = (AV *)SvRV (arg [0]); 2646 AV *av = (AV *)SvRV (arg [0]);
2492 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2647 SV *cb_cv = s_get_cv_croak (arg [1]);
2493 2648
2494 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2649 av_push (av, SvREFCNT_inc_NN (cb_cv));
2495 2650
2496 if (SvIVX (AvARRAY (av)[0]) > 0) 2651 if (SvIVX (AvARRAY (av)[0]) > 0)
2497 coro_semaphore_adjust (aTHX_ av, 0); 2652 coro_semaphore_adjust (aTHX_ av, 0);
2498 2653
2499 frame->prepare = prepare_nop; 2654 frame->prepare = prepare_nop;
2523 AvARRAY (av)[0] = AvARRAY (av)[1]; 2678 AvARRAY (av)[0] = AvARRAY (av)[1];
2524 AvARRAY (av)[1] = cb; 2679 AvARRAY (av)[1] = cb;
2525 2680
2526 cb = av_shift (av); 2681 cb = av_shift (av);
2527 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 {
2528 api_ready (aTHX_ cb); 2693 api_ready (aTHX_ cb);
2529 sv_setiv (cb, 0); /* signal waiter */ 2694 sv_setiv (cb, 0); /* signal waiter */
2695 }
2696
2530 SvREFCNT_dec (cb); 2697 SvREFCNT_dec (cb);
2531 2698
2532 --count; 2699 --count;
2533 } 2700 }
2534} 2701}
2543static void 2710static void
2544slf_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)
2545{ 2712{
2546 AV *av = (AV *)SvRV (arg [0]); 2713 AV *av = (AV *)SvRV (arg [0]);
2547 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
2548 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]))
2549 { 2727 {
2550 SvIVX (AvARRAY (av)[0]) = 0; 2728 SvIVX (AvARRAY (av)[0]) = 0;
2551 frame->prepare = prepare_nop; 2729 frame->prepare = prepare_nop;
2552 frame->check = slf_check_nop; 2730 frame->check = slf_check_nop;
2553 } 2731 }
2554 else 2732 else
2555 { 2733 {
2556 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2734 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2557 2735
2558 av_push (av, waiter); 2736 av_push (av, waiter);
2559 2737
2560 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 */
2561 frame->prepare = prepare_schedule; 2739 frame->prepare = prepare_schedule;
2579 2757
2580static void 2758static void
2581coro_aio_callback (pTHX_ CV *cv) 2759coro_aio_callback (pTHX_ CV *cv)
2582{ 2760{
2583 dXSARGS; 2761 dXSARGS;
2584 AV *state = (AV *)GENSUB_ARG; 2762 AV *state = (AV *)S_GENSUB_ARG;
2585 SV *coro = av_pop (state); 2763 SV *coro = av_pop (state);
2586 SV *data_sv = newSV (sizeof (struct io_state)); 2764 SV *data_sv = newSV (sizeof (struct io_state));
2587 2765
2588 av_extend (state, items - 1); 2766 av_extend (state, items - 1);
2589 2767
2703 2881
2704 for (i = 0; i < items; ++i) 2882 for (i = 0; i < items; ++i)
2705 PUSHs (arg [i]); 2883 PUSHs (arg [i]);
2706 2884
2707 /* now push the callback closure */ 2885 /* now push the callback closure */
2708 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))));
2709 2887
2710 /* now call the AIO function - we assume our request is uncancelable */ 2888 /* now call the AIO function - we assume our request is uncancelable */
2711 PUTBACK; 2889 PUTBACK;
2712 call_sv ((SV *)req, G_VOID | G_DISCARD); 2890 call_sv ((SV *)req, G_VOID | G_DISCARD);
2713 } 2891 }
2800 2978
2801 if (!svp) croak ("Time::HiRes is required"); 2979 if (!svp) croak ("Time::HiRes is required");
2802 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2980 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2803 2981
2804 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));
2805 } 2986 }
2806 2987
2807 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2988 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2808} 2989}
2809 2990
2810SV * 2991SV *
2811new (char *klass, ...) 2992new (char *klass, ...)
2812 ALIAS: 2993 ALIAS:
2814 CODE: 2995 CODE:
2815{ 2996{
2816 struct coro *coro; 2997 struct coro *coro;
2817 MAGIC *mg; 2998 MAGIC *mg;
2818 HV *hv; 2999 HV *hv;
2819 CV *cb; 3000 SV *cb;
2820 int i; 3001 int i;
2821 3002
2822 if (items > 1) 3003 if (items > 1)
2823 { 3004 {
2824 cb = coro_sv_2cv (aTHX_ ST (1)); 3005 cb = s_get_cv_croak (ST (1));
2825 3006
2826 if (!ix) 3007 if (!ix)
2827 { 3008 {
2828 if (CvISXSUB (cb)) 3009 if (CvISXSUB (cb))
2829 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");
2851 av_extend (coro->args, items - 1 + ix - 1); 3032 av_extend (coro->args, items - 1 + ix - 1);
2852 3033
2853 if (ix) 3034 if (ix)
2854 { 3035 {
2855 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3036 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2856 cb = cv_coro_run; 3037 cb = (SV *)cv_coro_run;
2857 } 3038 }
2858 3039
2859 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3040 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2860 3041
2861 for (i = 2; i < items; i++) 3042 for (i = 2; i < items; i++)
2887SV * 3068SV *
2888clone (Coro::State coro) 3069clone (Coro::State coro)
2889 CODE: 3070 CODE:
2890{ 3071{
2891#if CORO_CLONE 3072#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3073 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3074 MAGIC *mg;
2894 /* TODO: too much duplication */ 3075 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3076 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3077 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3078 mg->mg_flags |= MGf_DUP;
2959 eval = 1 3140 eval = 1
2960 CODE: 3141 CODE:
2961{ 3142{
2962 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3143 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2963 { 3144 {
2964 struct coro temp; 3145 struct coro *current = SvSTATE_current;
2965 3146
2966 if (!(coro->flags & CF_RUNNING)) 3147 if (current != coro)
2967 { 3148 {
2968 PUTBACK; 3149 PUTBACK;
2969 save_perl (aTHX_ &temp); 3150 save_perl (aTHX_ current);
2970 load_perl (aTHX_ coro); 3151 load_perl (aTHX_ coro);
3152 SPAGAIN;
2971 } 3153 }
2972 3154
2973 {
2974 dSP;
2975 ENTER;
2976 SAVETMPS;
2977 PUTBACK;
2978 PUSHSTACK; 3155 PUSHSTACK;
3156
2979 PUSHMARK (SP); 3157 PUSHMARK (SP);
3158 PUTBACK;
2980 3159
2981 if (ix) 3160 if (ix)
2982 eval_sv (coderef, 0); 3161 eval_sv (coderef, 0);
2983 else 3162 else
2984 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3163 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2985 3164
2986 POPSTACK; 3165 POPSTACK;
2987 SPAGAIN; 3166 SPAGAIN;
2988 FREETMPS;
2989 LEAVE;
2990 PUTBACK;
2991 }
2992 3167
2993 if (!(coro->flags & CF_RUNNING)) 3168 if (current != coro)
2994 { 3169 {
3170 PUTBACK;
2995 save_perl (aTHX_ coro); 3171 save_perl (aTHX_ coro);
2996 load_perl (aTHX_ &temp); 3172 load_perl (aTHX_ current);
2997 SPAGAIN; 3173 SPAGAIN;
2998 } 3174 }
2999 } 3175 }
3000} 3176}
3001 3177
3005 ALIAS: 3181 ALIAS:
3006 is_ready = CF_READY 3182 is_ready = CF_READY
3007 is_running = CF_RUNNING 3183 is_running = CF_RUNNING
3008 is_new = CF_NEW 3184 is_new = CF_NEW
3009 is_destroyed = CF_DESTROYED 3185 is_destroyed = CF_DESTROYED
3186 is_suspended = CF_SUSPENDED
3010 CODE: 3187 CODE:
3011 RETVAL = boolSV (coro->flags & ix); 3188 RETVAL = boolSV (coro->flags & ix);
3012 OUTPUT: 3189 OUTPUT:
3013 RETVAL 3190 RETVAL
3014 3191
3018 CODE: 3195 CODE:
3019{ 3196{
3020 struct coro *current = SvSTATE_current; 3197 struct coro *current = SvSTATE_current;
3021 SV **throwp = self == current ? &CORO_THROW : &self->except; 3198 SV **throwp = self == current ? &CORO_THROW : &self->except;
3022 SvREFCNT_dec (*throwp); 3199 SvREFCNT_dec (*throwp);
3200 SvGETMAGIC (throw);
3023 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3201 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3024} 3202}
3025 3203
3026void 3204void
3027api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3205api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3079 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3257 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3080 3258
3081 SV *tmp = *src; *src = *dst; *dst = tmp; 3259 SV *tmp = *src; *src = *dst; *dst = tmp;
3082 } 3260 }
3083 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}
3084 3305
3085MODULE = Coro::State PACKAGE = Coro 3306MODULE = Coro::State PACKAGE = Coro
3086 3307
3087BOOT: 3308BOOT:
3088{ 3309{
3089 int i;
3090
3091 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3310 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3092 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3311 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3093 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3312 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3094 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3313 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3095 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);
3096 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3315 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3097 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3316 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3098 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);
3099 3319
3100 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);
3101 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3321 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3102 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);
3103 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);
3104 3324
3105 coro_stash = gv_stashpv ("Coro", TRUE); 3325 coro_stash = gv_stashpv ("Coro", TRUE);
3106 3326
3107 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3327 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3108 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3328 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3109 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3329 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3110 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3330 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3111 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3331 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3112 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3332 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3113
3114 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3115 coro_ready[i] = newAV ();
3116 3333
3117 { 3334 {
3118 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3335 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3119 3336
3120 coroapi.schedule = api_schedule; 3337 coroapi.schedule = api_schedule;
3161cede_notself (...) 3378cede_notself (...)
3162 CODE: 3379 CODE:
3163 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3380 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3164 3381
3165void 3382void
3166_cancel (Coro::State self)
3167 CODE:
3168 coro_state_destroy (aTHX_ self);
3169 coro_call_on_destroy (aTHX_ self);
3170
3171void
3172_set_current (SV *current) 3383_set_current (SV *current)
3173 PROTOTYPE: $ 3384 PROTOTYPE: $
3174 CODE: 3385 CODE:
3175 SvREFCNT_dec (SvRV (coro_current)); 3386 SvREFCNT_dec (SvRV (coro_current));
3176 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3387 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3178void 3389void
3179_set_readyhook (SV *hook) 3390_set_readyhook (SV *hook)
3180 PROTOTYPE: $ 3391 PROTOTYPE: $
3181 CODE: 3392 CODE:
3182 SvREFCNT_dec (coro_readyhook); 3393 SvREFCNT_dec (coro_readyhook);
3394 SvGETMAGIC (hook);
3395 if (SvOK (hook))
3396 {
3183 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 }
3184 3405
3185int 3406int
3186prio (Coro::State coro, int newprio = 0) 3407prio (Coro::State coro, int newprio = 0)
3187 PROTOTYPE: $;$ 3408 PROTOTYPE: $;$
3188 ALIAS: 3409 ALIAS:
3194 if (items > 1) 3415 if (items > 1)
3195 { 3416 {
3196 if (ix) 3417 if (ix)
3197 newprio = coro->prio - newprio; 3418 newprio = coro->prio - newprio;
3198 3419
3199 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3420 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3200 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3421 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3201 3422
3202 coro->prio = newprio; 3423 coro->prio = newprio;
3203 } 3424 }
3204} 3425}
3205 OUTPUT: 3426 OUTPUT:
3218 PROTOTYPE: 3439 PROTOTYPE:
3219 CODE: 3440 CODE:
3220 RETVAL = coro_nready; 3441 RETVAL = coro_nready;
3221 OUTPUT: 3442 OUTPUT:
3222 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;
3223 3456
3224void 3457void
3225_pool_handler (...) 3458_pool_handler (...)
3226 CODE: 3459 CODE:
3227 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3460 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3282rouse_wait (...) 3515rouse_wait (...)
3283 PROTOTYPE: ;$ 3516 PROTOTYPE: ;$
3284 PPCODE: 3517 PPCODE:
3285 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3518 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3286 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
3287 3545
3288MODULE = Coro::State PACKAGE = PerlIO::cede 3546MODULE = Coro::State PACKAGE = PerlIO::cede
3289 3547
3290BOOT: 3548BOOT:
3291 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3549 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3294MODULE = Coro::State PACKAGE = Coro::Semaphore 3552MODULE = Coro::State PACKAGE = Coro::Semaphore
3295 3553
3296SV * 3554SV *
3297new (SV *klass, SV *count = 0) 3555new (SV *klass, SV *count = 0)
3298 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
3299 RETVAL = sv_bless ( 3568 RETVAL = sv_bless (
3300 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3569 coro_waitarray_new (aTHX_ semcnt),
3301 GvSTASH (CvGV (cv)) 3570 GvSTASH (CvGV (cv))
3302 ); 3571 );
3572}
3303 OUTPUT: 3573 OUTPUT:
3304 RETVAL 3574 RETVAL
3305 3575
3306# helper for Coro::Channel 3576# helper for Coro::Channel and others
3307SV * 3577SV *
3308_alloc (int count) 3578_alloc (int count)
3309 CODE: 3579 CODE:
3310 RETVAL = coro_waitarray_new (aTHX_ count); 3580 RETVAL = coro_waitarray_new (aTHX_ count);
3311 OUTPUT: 3581 OUTPUT:
3369 for (i = 1; i <= wcount; ++i) 3639 for (i = 1; i <= wcount; ++i)
3370 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3640 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3371 } 3641 }
3372} 3642}
3373 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
3374MODULE = Coro::State PACKAGE = Coro::Signal 3660MODULE = Coro::State PACKAGE = Coro::Signal
3375 3661
3376SV * 3662SV *
3377new (SV *klass) 3663new (SV *klass)
3378 CODE: 3664 CODE:
3449 3735
3450void 3736void
3451_register (char *target, char *proto, SV *req) 3737_register (char *target, char *proto, SV *req)
3452 CODE: 3738 CODE:
3453{ 3739{
3454 CV *req_cv = coro_sv_2cv (aTHX_ req); 3740 SV *req_cv = s_get_cv_croak (req);
3455 /* newXSproto doesn't return the CV on 5.8 */ 3741 /* newXSproto doesn't return the CV on 5.8 */
3456 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3742 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3457 sv_setpv ((SV *)slf_cv, proto); 3743 sv_setpv ((SV *)slf_cv, proto);
3458 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);
3459} 3745}
3460 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