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.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50:23 2009 UTC

1#define CORO_CLONE 1 //D
2
3#include "libcoro/coro.c" 1#include "libcoro/coro.c"
4 2
5#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 4#define PERL_EXT
7 5
8#include "EXTERN.h" 6#include "EXTERN.h"
9#include "perl.h" 7#include "perl.h"
10#include "XSUB.h" 8#include "XSUB.h"
11#include "perliol.h" 9#include "perliol.h"
12 10
13#include "patchlevel.h" 11#include "schmorp.h"
14 12
15#include <stdio.h> 13#include <stdio.h>
16#include <errno.h> 14#include <errno.h>
17#include <assert.h> 15#include <assert.h>
18 16
53#endif 51#endif
54 52
55/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
56static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
57 55
58#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \
62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
63
64#if !PERL_VERSION_ATLEAST (5,6,0)
65# ifndef PL_ppaddr
66# define PL_ppaddr ppaddr
67# endif
68# ifndef call_sv
69# define call_sv perl_call_sv
70# endif
71# ifndef get_sv
72# define get_sv perl_get_sv
73# endif
74# ifndef get_cv
75# define get_cv perl_get_cv
76# endif
77# ifndef IS_PADGV
78# define IS_PADGV(v) 0
79# endif
80# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0
82# endif
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.10.0 */
91#ifndef SvREFCNT_inc_NN
92# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
93#endif
94
95/* 5.8.8 */
96#ifndef GV_NOTQUAL
97# define GV_NOTQUAL 0
98#endif
99#ifndef newSV
100# define newSV(l) NEWSV(0,l)
101#endif
102#ifndef CvISXSUB_on
103# define CvISXSUB_on(cv) (void)cv
104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
111
112/* 5.8.7 */
113#ifndef SvRV_set
114# define SvRV_set(s,v) SvRV(s) = (v)
115#endif
116
117#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
118# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
119#endif 58#endif
120 59
121#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
135#else 74#else
136# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
137# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
138#endif 77#endif
139 78
140#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
141 80
142#if __GNUC__ >= 3 81#if __GNUC__ >= 3
143# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
144# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
145# define INLINE static inline 84# define INLINE static inline
146#else 85#else
147# define attribute(x) 86# define attribute(x)
148# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
149# define INLINE static 88# define INLINE static
161# if CORO_PTHREAD 100# if CORO_PTHREAD
162static void *coro_thx; 101static void *coro_thx;
163# endif 102# endif
164#endif 103#endif
165 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
166static 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]);
167 117
168/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
169#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
170static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
171 121
177static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
179 129
180static AV *av_destroy; /* destruction queue */ 130static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */ 131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
182 133
183static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
184static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
185static SV *rv_diehook; 136static SV *rv_diehook;
186static SV *rv_warnhook; 137static SV *rv_warnhook;
191static SV *sv_pool_size; 142static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */ 143static SV *sv_async_pool_idle; /* description string */
193static AV *av_async_pool; /* idle pool */ 144static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */ 145static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler; 146static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
197 147
198/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
199static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
200 156
201static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
202static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
203 159
204enum { 160enum {
230 int valgrind_id; 186 int valgrind_id;
231#endif 187#endif
232 unsigned char flags; 188 unsigned char flags;
233} coro_cctx; 189} coro_cctx;
234 190
191coro_cctx *cctx_current; /* the currently running cctx */
192
193/*****************************************************************************/
194
235enum { 195enum {
236 CF_RUNNING = 0x0001, /* coroutine is running */ 196 CF_RUNNING = 0x0001, /* coroutine is running */
237 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
238 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
239 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
240}; 201};
241 202
242/* the structure where most of the perl state is stored, overlaid on the cxstack */ 203/* the structure where most of the perl state is stored, overlaid on the cxstack */
243typedef struct 204typedef struct
244{ 205{
245 SV *defsv; 206 SV *defsv;
246 AV *defav; 207 AV *defav;
247 SV *errsv; 208 SV *errsv;
248 SV *irsgv; 209 SV *irsgv;
210 HV *hinthv;
249#define VAR(name,type) type name; 211#define VAR(name,type) type name;
250# include "state.h" 212# include "state.h"
251#undef VAR 213#undef VAR
252} perl_slots; 214} perl_slots;
253 215
255 217
256/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
257struct coro { 219struct coro {
258 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
259 coro_cctx *cctx; 221 coro_cctx *cctx;
222
223 /* ready queue */
224 struct coro *next_ready;
260 225
261 /* state data */ 226 /* state data */
262 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
263 AV *mainstack; 228 AV *mainstack;
264 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
281 /* async_pool */ 246 /* async_pool */
282 SV *saved_deffh; 247 SV *saved_deffh;
283 SV *invoke_cb; 248 SV *invoke_cb;
284 AV *invoke_av; 249 AV *invoke_av;
285 250
251 /* on_enter/on_leave */
252 AV *on_enter;
253 AV *on_leave;
254
255 /* times */
256 coro_ts t_cpu, t_real;
257
286 /* linked list */ 258 /* linked list */
287 struct coro *next, *prev; 259 struct coro *next, *prev;
288}; 260};
289 261
290typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
295/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
296static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
297 269
298/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
299 271
300#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
301#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
302#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
303#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
304#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
305#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
306 278
307/* for Coro.pm */ 279/* for Coro.pm */
308static SV *coro_current; 280static SV *coro_current;
309static SV *coro_readyhook; 281static SV *coro_readyhook;
310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
311static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
312static struct coro *coro_first; 284static struct coro *coro_first;
313#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
314 306
315/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
316 308
317static SV * 309static SV *
318coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
342 get_hv (name, create); 334 get_hv (name, create);
343#endif 335#endif
344 return get_hv (name, create); 336 return get_hv (name, create);
345} 337}
346 338
347/* may croak */ 339INLINE void
348INLINE CV * 340coro_times_update ()
349coro_sv_2cv (pTHX_ SV *sv)
350{ 341{
342#ifdef coro_clock_gettime
343 struct timespec ts;
344
345 ts.tv_sec = ts.tv_nsec = 0;
346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
348
349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
384}
385
386/*****************************************************************************/
387/* magic glue */
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391
392#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \
395 : mg_find (sv, type))
396
397#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \
400 : 0)
401
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404
405INLINE struct coro *
406SvSTATE_ (pTHX_ SV *coro)
407{
351 HV *st; 408 HV *stash;
352 GV *gvp; 409 MAGIC *mg;
353 return sv_2cv (sv, &st, &gvp, 0); 410
411 if (SvROK (coro))
412 coro = SvRV (coro);
413
414 if (expect_false (SvTYPE (coro) != SVt_PVHV))
415 croak ("Coro::State object required");
416
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr;
354} 427}
428
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430
431/* faster than SvSTATE, but expects a coroutine hv */
432#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434
435/*****************************************************************************/
436/* padlist management and caching */
355 437
356static AV * 438static AV *
357coro_derive_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
358{ 440{
359 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
367 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
368#endif 450#endif
369 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
370 --AvFILLp (padlist); 452 --AvFILLp (padlist);
371 453
372 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
373 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
374 456
375 return newpadlist; 457 return newpadlist;
376} 458}
377 459
378static void 460static void
379free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
380{ 462{
381 /* may be during global destruction */ 463 /* may be during global destruction */
382 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
383 { 465 {
384 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
385 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
386 { 469 {
387 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
388 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
389 { 472 I32 j = AvFILLp (av);
390 SV *sv; 473
391 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
392 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
393
394 SvREFCNT_dec (*svp);
395 }
396 } 479 }
397 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
398 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
399 } 485 }
400} 486}
401 487
402static int 488static int
403coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
404{ 490{
405 AV *padlist; 491 AV *padlist;
406 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
407 497
408 /* casting is fun. */ 498 /* casting is fun. */
409 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
410 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
411 501
412 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
413 503
414 return 0; 504 return 0;
415} 505}
416
417#define CORO_MAGIC_type_cv 26
418#define CORO_MAGIC_type_state PERL_MAGIC_ext
419 506
420static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
421 0, 0, 0, 0, 508 0, 0, 0, 0,
422 coro_cv_free 509 coro_cv_free
423}; 510};
424
425#define CORO_MAGIC_NN(sv, type) \
426 (expect_true (SvMAGIC (sv)->mg_type == type) \
427 ? SvMAGIC (sv) \
428 : mg_find (sv, type))
429
430#define CORO_MAGIC(sv, type) \
431 (expect_true (SvMAGIC (sv)) \
432 ? CORO_MAGIC_NN (sv, type) \
433 : 0)
434
435#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
436#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
437
438INLINE struct coro *
439SvSTATE_ (pTHX_ SV *coro)
440{
441 HV *stash;
442 MAGIC *mg;
443
444 if (SvROK (coro))
445 coro = SvRV (coro);
446
447 if (expect_false (SvTYPE (coro) != SVt_PVHV))
448 croak ("Coro::State object required");
449
450 stash = SvSTASH (coro);
451 if (expect_false (stash != coro_stash && stash != coro_state_stash))
452 {
453 /* very slow, but rare, check */
454 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
455 croak ("Coro::State object required");
456 }
457
458 mg = CORO_MAGIC_state (coro);
459 return (struct coro *)mg->mg_ptr;
460}
461
462#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
463
464/* faster than SvSTATE, but expects a coroutine hv */
465#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
466#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
467 511
468/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
469static void 513static void
470get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
471{ 515{
499 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
500 544
501 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
502 546
503 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
504 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
505 549
506 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
507} 551}
508 552
509/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
510 557
511static void 558static void
512load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
513{ 560{
514 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
515 c->slot = 0; 562 c->slot = 0;
516 563
517 PL_mainstack = c->mainstack; 564 PL_mainstack = c->mainstack;
518 565
519 GvSV (PL_defgv) = slot->defsv; 566 GvSV (PL_defgv) = slot->defsv;
520 GvAV (PL_defgv) = slot->defav; 567 GvAV (PL_defgv) = slot->defav;
521 GvSV (PL_errgv) = slot->errsv; 568 GvSV (PL_errgv) = slot->errsv;
522 GvSV (irsgv) = slot->irsgv; 569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
523 571
524 #define VAR(name,type) PL_ ## name = slot->name; 572 #define VAR(name,type) PL_ ## name = slot->name;
525 # include "state.h" 573 # include "state.h"
526 #undef VAR 574 #undef VAR
527 575
541 PUTBACK; 589 PUTBACK;
542 } 590 }
543 591
544 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
545 CORO_THROW = c->except; 593 CORO_THROW = c->except;
594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
603 if (expect_false (c->on_enter))
604 {
605 int i;
606
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 }
546} 610}
547 611
548static void 612static void
549save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
550{ 614{
615 if (expect_false (c->on_leave))
616 {
617 int i;
618
619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
629 }
630
551 c->except = CORO_THROW; 631 c->except = CORO_THROW;
552 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
553 633
554 { 634 {
555 dSP; 635 dSP;
568 { 648 {
569 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
570 { 650 {
571 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
572 652
573 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
574 { 654 {
575 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
576 656
577 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
578 { 658 {
602 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
603 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
604 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
605 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
606 { 686 {
607 int i; 687 unsigned int i;
608 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
609 CXINC; 689 CXINC;
610 } 690 }
611 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
612 692
613 c->mainstack = PL_mainstack; 693 c->mainstack = PL_mainstack;
614 694
615 { 695 {
616 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
617 697
618 slot->defav = GvAV (PL_defgv); 698 slot->defav = GvAV (PL_defgv);
619 slot->defsv = DEFSV; 699 slot->defsv = DEFSV;
620 slot->errsv = ERRSV; 700 slot->errsv = ERRSV;
621 slot->irsgv = GvSV (irsgv); 701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
622 703
623 #define VAR(name,type) slot->name = PL_ ## name; 704 #define VAR(name,type) slot->name = PL_ ## name;
624 # include "state.h" 705 # include "state.h"
625 #undef VAR 706 #undef VAR
626 } 707 }
753#endif 834#endif
754 835
755/* 836/*
756 * This overrides the default magic get method of %SIG elements. 837 * This overrides the default magic get method of %SIG elements.
757 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
758 * and instead of tryign to save and restore the hash elements, we just provide 839 * and instead of trying to save and restore the hash elements, we just provide
759 * readback here. 840 * readback here.
760 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
761 * not expecting this to actually change the hook. This is a potential problem
762 * when a schedule happens then, but we ignore this.
763 */ 841 */
764static int 842static int
765coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
766{ 844{
767 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
820 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
821 899
822 if (svp) 900 if (svp)
823 { 901 {
824 SV *old = *svp; 902 SV *old = *svp;
825 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
826 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
827 return 0; 905 return 0;
828 } 906 }
829 } 907 }
830 908
862 940
863 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
864 PL_curcop = &PL_compiling; 942 PL_curcop = &PL_compiling;
865 PL_in_eval = EVAL_NULL; 943 PL_in_eval = EVAL_NULL;
866 PL_comppad = 0; 944 PL_comppad = 0;
945 PL_comppad_name = 0;
946 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0;
867 PL_curpm = 0; 948 PL_curpm = 0;
868 PL_curpad = 0; 949 PL_curpad = 0;
869 PL_localizing = 0; 950 PL_localizing = 0;
870 PL_dirty = 0; 951 PL_dirty = 0;
871 PL_restartop = 0; 952 PL_restartop = 0;
872#if PERL_VERSION_ATLEAST (5,10,0) 953#if PERL_VERSION_ATLEAST (5,10,0)
873 PL_parser = 0; 954 PL_parser = 0;
874#endif 955#endif
956 PL_hints = 0;
875 957
876 /* recreate the die/warn hooks */ 958 /* recreate the die/warn hooks */
877 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
878 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
879 961
880 GvSV (PL_defgv) = newSV (0); 962 GvSV (PL_defgv) = newSV (0);
881 GvAV (PL_defgv) = coro->args; coro->args = 0; 963 GvAV (PL_defgv) = coro->args; coro->args = 0;
882 GvSV (PL_errgv) = newSV (0); 964 GvSV (PL_errgv) = newSV (0);
883 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0;
884 PL_rs = newSVsv (GvSV (irsgv)); 967 PL_rs = newSVsv (GvSV (irsgv));
885 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
886 969
887 { 970 {
888 dSP; 971 dSP;
914 997
915 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
916 999
917 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
918 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
919}
920 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
921static void 1010static void
922coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
923{ 1012{
924 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
925 { 1014 {
926 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
927 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
935 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
936 1025
937 /* unwind main stack */ 1026 /* unwind main stack */
938 dounwind (-1); 1027 dounwind (-1);
939 } 1028 }
1029}
940 1030
941 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
942 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
943 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
944 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
945 SvREFCNT_dec (PL_rs);
946 SvREFCNT_dec (GvSV (irsgv));
947 1035
948 SvREFCNT_dec (PL_diehook);
949 SvREFCNT_dec (PL_warnhook);
950 1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
1046
1047 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs;
1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1058
1059 load_perl (aTHX_ current);
1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
951 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
952 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb); 1070 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av); 1071 SvREFCNT_dec (coro->invoke_av);
955 1072 }
956 coro_destruct_stacks (aTHX);
957} 1073}
958 1074
959INLINE void 1075INLINE void
960free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
961{ 1077{
969static int 1085static int
970runops_trace (pTHX) 1086runops_trace (pTHX)
971{ 1087{
972 COP *oldcop = 0; 1088 COP *oldcop = 0;
973 int oldcxix = -2; 1089 int oldcxix = -2;
974 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
975 coro_cctx *cctx = coro->cctx;
976 1090
977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1091 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
978 { 1092 {
979 PERL_ASYNC_CHECK (); 1093 PERL_ASYNC_CHECK ();
980 1094
981 if (cctx->flags & CC_TRACE_ALL) 1095 if (cctx_current->flags & CC_TRACE_ALL)
982 { 1096 {
983 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1097 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
984 { 1098 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1099 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 SV **bot, **top; 1100 SV **bot, **top;
987 AV *av = newAV (); /* return values */ 1101 AV *av = newAV (); /* return values */
988 SV **cb; 1102 SV **cb;
1025 1139
1026 if (PL_curcop != &PL_compiling) 1140 if (PL_curcop != &PL_compiling)
1027 { 1141 {
1028 SV **cb; 1142 SV **cb;
1029 1143
1030 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1031 { 1145 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1147
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1149 {
1058 } 1172 }
1059 1173
1060 oldcxix = cxstack_ix; 1174 oldcxix = cxstack_ix;
1061 } 1175 }
1062 1176
1063 if (cctx->flags & CC_TRACE_LINE) 1177 if (cctx_current->flags & CC_TRACE_LINE)
1064 { 1178 {
1065 dSP; 1179 dSP;
1066 1180
1067 PL_runops = RUNOPS_DEFAULT; 1181 PL_runops = RUNOPS_DEFAULT;
1068 ENTER; 1182 ENTER;
1087 1201
1088 TAINT_NOT; 1202 TAINT_NOT;
1089 return 0; 1203 return 0;
1090} 1204}
1091 1205
1092static struct coro_cctx *cctx_ssl_cctx;
1093static struct CoroSLF cctx_ssl_frame; 1206static struct CoroSLF cctx_ssl_frame;
1094 1207
1095static void 1208static void
1096slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1209slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1097{ 1210{
1098 ta->prev = (struct coro *)cctx_ssl_cctx;
1099 ta->next = 0; 1211 ta->prev = 0;
1100} 1212}
1101 1213
1102static int 1214static int
1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1215slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1104{ 1216{
1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1108} 1220}
1109 1221
1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1111static void NOINLINE 1223static void NOINLINE
1112cctx_prepare (pTHX_ coro_cctx *cctx) 1224cctx_prepare (pTHX)
1113{ 1225{
1114 PL_top_env = &PL_start_env; 1226 PL_top_env = &PL_start_env;
1115 1227
1116 if (cctx->flags & CC_TRACE) 1228 if (cctx_current->flags & CC_TRACE)
1117 PL_runops = runops_trace; 1229 PL_runops = runops_trace;
1118 1230
1119 /* we already must be executing an SLF op, there is no other valid way 1231 /* we already must be executing an SLF op, there is no other valid way
1120 * that can lead to creation of a new cctx */ 1232 * that can lead to creation of a new cctx */
1121 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1233 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1234 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1123 1235
1124 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1236 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1125 cctx_ssl_cctx = cctx;
1126 cctx_ssl_frame = slf_frame; 1237 cctx_ssl_frame = slf_frame;
1127 1238
1128 slf_frame.prepare = slf_prepare_set_stacklevel; 1239 slf_frame.prepare = slf_prepare_set_stacklevel;
1129 slf_frame.check = slf_check_set_stacklevel; 1240 slf_frame.check = slf_check_set_stacklevel;
1130} 1241}
1153 /* normally we would need to skip the entersub here */ 1264 /* normally we would need to skip the entersub here */
1154 /* not doing so will re-execute it, which is exactly what we want */ 1265 /* not doing so will re-execute it, which is exactly what we want */
1155 /* PL_nop = PL_nop->op_next */ 1266 /* PL_nop = PL_nop->op_next */
1156 1267
1157 /* inject a fake subroutine call to cctx_init */ 1268 /* inject a fake subroutine call to cctx_init */
1158 cctx_prepare (aTHX_ (coro_cctx *)arg); 1269 cctx_prepare (aTHX);
1159 1270
1160 /* cctx_run is the alternative tail of transfer() */ 1271 /* cctx_run is the alternative tail of transfer() */
1161 transfer_tail (aTHX); 1272 transfer_tail (aTHX);
1162 1273
1163 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1164 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1165 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1166 /* 1277 /*
1167 * Unfortunately, there is no way to get at the return values of the 1278 * Unfortunately, there is no way to get at the return values of the
1168 * coro body here, as perl_run destroys these 1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1169 */ 1281 */
1170 1282
1171 /* 1283 /*
1172 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1173 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1174 * reason for perl_run to return. We try to exit by jumping to the 1286 * reason for perl_run to return. We try to exit by jumping to the
1175 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1176 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1177 */ 1291 */
1178 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1179 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1180 } 1294 }
1181} 1295}
1258cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1259{ 1373{
1260 if (!cctx) 1374 if (!cctx)
1261 return; 1375 return;
1262 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1263 --cctx_count; 1379 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1265 1381
1266 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1267 if (cctx->sptr) 1383 if (cctx->sptr)
1330 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1331 1447
1332 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1333 { 1449 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1335 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1336 1452
1337 if (expect_false (next->flags & CF_RUNNING))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1341 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1342 1455
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1345 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1346#endif 1459#endif
1352transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1353{ 1466{
1354 dSTACKLEVEL; 1467 dSTACKLEVEL;
1355 1468
1356 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1357 if (expect_false (!next)) 1470 if (expect_false (!prev))
1358 { 1471 {
1359 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1472 cctx_current->idle_sp = STACKLEVEL;
1360 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1361 } 1474 }
1362 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1363 { 1476 {
1364 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1365 1478
1366 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1367 { 1480 {
1368 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1369 prev->cctx = cctx_new_empty ();
1370 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1372 } 1484 }
1373 1485
1374 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
1385 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1386 } 1498 }
1387 else 1499 else
1388 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1389 1501
1390 prev__cctx = prev->cctx;
1391
1392 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1393 if (expect_true ( 1503 if (expect_true (
1394 prev__cctx->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1395 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1396 && !force_cctx 1506 && !force_cctx
1397 )) 1507 ))
1398 { 1508 {
1399 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1400 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1401 1511
1402 prev->cctx = 0;
1403
1404 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1405 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1513 /* without this the next cctx_get might destroy the running cctx while still in use */
1406 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1407 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1408 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1409 1517
1410 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1411 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1412 1522
1413 ++next->usecount; 1523 ++next->usecount;
1414 1524
1415 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1416 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1417 1527
1418 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1419 { 1531 {
1420 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1535 }
1424 1536
1425 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1426 } 1538 }
1427} 1539}
1435coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1548{
1437 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1438 return 0; 1550 return 0;
1439 1551
1440 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1441 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1442 1554
1443 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1444 1556
1445 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
1449 --coro_nready; 1561 --coro_nready;
1450 } 1562 }
1451 else 1563 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1565
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1455 { 1567 && coro->mainstack != main_mainstack
1456 struct coro temp; 1568 && coro->slot
1457 1569 && !PL_dirty)
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1459
1460 save_perl (aTHX_ &temp);
1461 load_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1571
1470 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1473 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
1532 1634
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1535} 1637}
1536 1638
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1561 1640
1562INLINE void 1641INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1564{ 1643{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1645
1568INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1569coro_deq (pTHX) 1654coro_deq (pTHX)
1570{ 1655{
1571 int prio; 1656 int prio;
1572 1657
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1575 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1576 1669
1577 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1578} 1688}
1579 1689
1580static int 1690static int
1581api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1582{ 1692{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1591 1694
1592 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1593 return 0; 1696 return 0;
1594 1697
1595 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1596 1699
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1701
1603 if (sv_hook) 1702 if (!coro_nready++)
1604 { 1703 if (coroapi.readyhook)
1605 dSP; 1704 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1705
1621 return 1; 1706 return 1;
1622} 1707}
1623 1708
1624static int 1709static int
1647static void 1732static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1734{
1650 for (;;) 1735 for (;;)
1651 { 1736 {
1652 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1653 1738
1654 if (expect_true (next_sv)) 1739 if (expect_true (next))
1655 { 1740 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1744 else
1662 { 1745 {
1663 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1664 --coro_nready; 1747 --coro_nready;
1665 1748
1668 } 1751 }
1669 } 1752 }
1670 else 1753 else
1671 { 1754 {
1672 /* nothing to schedule: call the idle handler */ 1755 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle)))
1758 {
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready;
1762 }
1763 else
1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1766 dSP;
1674 1767
1675 ENTER; 1768 ENTER;
1676 SAVETMPS; 1769 SAVETMPS;
1677 1770
1678 PUSHMARK (SP); 1771 PUSHMARK (SP);
1679 PUTBACK; 1772 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1773 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1774
1682 FREETMPS; 1775 FREETMPS;
1683 LEAVE; 1776 LEAVE;
1777 }
1684 } 1778 }
1685 } 1779 }
1686} 1780}
1687 1781
1688INLINE void 1782INLINE void
1759static void 1853static void
1760api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1761{ 1855{
1762 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1763 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1764 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1765 { 1862 {
1766 if (!coro->cctx) 1863 if (!coro->cctx)
1767 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1768 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1769 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1770 1867
1771 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1772 } 1869 }
1773 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1774 { 1871 {
1819{ 1916{
1820 int i; 1917 int i;
1821 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV (); 1919 AV *av = newAV ();
1823 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1824 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1825 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1827 1929
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1829 1931
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
1832 1934
1833 frame->prepare = prepare_schedule; 1935 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat; 1936 frame->check = slf_check_repeat;
1937
1938 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/
1835} 1941}
1836 1942
1837/*****************************************************************************/ 1943/*****************************************************************************/
1838/* async pool handler */ 1944/* async pool handler */
1839 1945
1917 2023
1918static void 2024static void
1919coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1920{ 2026{
1921 dXSARGS; 2027 dXSARGS;
1922 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1923 2029
1924 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1925 { 2031 {
1926 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data);
1927 AV *av = newAV (); 2034 AV *av = newAV ();
1928 SV *coro = SvRV (data);
1929 2035
1930 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1931 api_ready (aTHX_ coro);
1932 SvREFCNT_dec (coro);
1933 2037
1934 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
1935 while (items--) 2039 while (items--)
1936 av_store (av, items, newSVsv (ST (items))); 2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
1937 } 2044 }
1938 2045
1939 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
1940} 2047}
1941 2048
1958 2065
1959 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
1960 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
1961 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1962 2069
1963 /* we have stolen the elements, so ste length to zero and free */ 2070 /* we have stolen the elements, so set length to zero and free */
1964 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
1965 av_undef (av); 2072 av_undef (av);
1966 2073
1967 PUTBACK; 2074 PUTBACK;
1968 } 2075 }
1992 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
1993 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1994 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
1995 2102
1996 { 2103 {
1997 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1998 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
1999 2106
2000 frame->data = (void *)data; 2107 frame->data = (void *)data;
2001 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2002 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2003 } 2110 }
2007coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2008{ 2115{
2009 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2010 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2011 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2012 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2013 2120
2014 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2015 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2016 2123
2017 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2224 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2225 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
2226 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2227 2334
2228 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2229 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2230 slf_cv = cv; 2338 slf_cv = cv;
2231 2339
2232 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
2233 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
2258 2366
2259 PL_op->op_ppaddr = pp_slf; 2367 PL_op->op_ppaddr = pp_slf;
2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2368 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2261 2369
2262 PL_op = (OP *)&slf_restore; 2370 PL_op = (OP *)&slf_restore;
2371}
2372
2373/*****************************************************************************/
2374/* dynamic wind */
2375
2376static void
2377on_enterleave_call (pTHX_ SV *cb)
2378{
2379 dSP;
2380
2381 PUSHSTACK;
2382
2383 PUSHMARK (SP);
2384 PUTBACK;
2385 call_sv (cb, G_VOID | G_DISCARD);
2386 SPAGAIN;
2387
2388 POPSTACK;
2389}
2390
2391static SV *
2392coro_avp_pop_and_free (pTHX_ AV **avp)
2393{
2394 AV *av = *avp;
2395 SV *res = av_pop (av);
2396
2397 if (AvFILLp (av) < 0)
2398 {
2399 *avp = 0;
2400 SvREFCNT_dec (av);
2401 }
2402
2403 return res;
2404}
2405
2406static void
2407coro_pop_on_enter (pTHX_ void *coro)
2408{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2410 SvREFCNT_dec (cb);
2411}
2412
2413static void
2414coro_pop_on_leave (pTHX_ void *coro)
2415{
2416 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2417 on_enterleave_call (aTHX_ sv_2mortal (cb));
2263} 2418}
2264 2419
2265/*****************************************************************************/ 2420/*****************************************************************************/
2266/* PerlIO::cede */ 2421/* PerlIO::cede */
2267 2422
2341/* Coro::Semaphore & Coro::Signal */ 2496/* Coro::Semaphore & Coro::Signal */
2342 2497
2343static SV * 2498static SV *
2344coro_waitarray_new (pTHX_ int count) 2499coro_waitarray_new (pTHX_ int count)
2345{ 2500{
2346 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2501 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2347 AV *av = newAV (); 2502 AV *av = newAV ();
2348 SV **ary; 2503 SV **ary;
2349 2504
2350 /* unfortunately, building manually saves memory */ 2505 /* unfortunately, building manually saves memory */
2351 Newx (ary, 2, SV *); 2506 Newx (ary, 2, SV *);
2352 AvALLOC (av) = ary; 2507 AvALLOC (av) = ary;
2508#if PERL_VERSION_ATLEAST (5,10,0)
2353 /*AvARRAY (av) = ary;*/ 2509 AvARRAY (av) = ary;
2510#else
2354 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2511 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2512 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2513 SvPVX ((SV *)av) = (char *)ary;
2514#endif
2355 AvMAX (av) = 1; 2515 AvMAX (av) = 1;
2356 AvFILLp (av) = 0; 2516 AvFILLp (av) = 0;
2357 ary [0] = newSViv (count); 2517 ary [0] = newSViv (count);
2358 2518
2359 return newRV_noinc ((SV *)av); 2519 return newRV_noinc ((SV *)av);
2488{ 2648{
2489 if (items >= 2) 2649 if (items >= 2)
2490 { 2650 {
2491 /* callback form */ 2651 /* callback form */
2492 AV *av = (AV *)SvRV (arg [0]); 2652 AV *av = (AV *)SvRV (arg [0]);
2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2494 2654
2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2496 2656
2497 if (SvIVX (AvARRAY (av)[0]) > 0) 2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2498 coro_semaphore_adjust (aTHX_ av, 0); 2658 coro_semaphore_adjust (aTHX_ av, 0);
2499 2659
2500 frame->prepare = prepare_nop; 2660 frame->prepare = prepare_nop;
2524 AvARRAY (av)[0] = AvARRAY (av)[1]; 2684 AvARRAY (av)[0] = AvARRAY (av)[1];
2525 AvARRAY (av)[1] = cb; 2685 AvARRAY (av)[1] = cb;
2526 2686
2527 cb = av_shift (av); 2687 cb = av_shift (av);
2528 2688
2689 if (SvTYPE (cb) == SVt_PVCV)
2690 {
2691 dSP;
2692 PUSHMARK (SP);
2693 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2694 PUTBACK;
2695 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2696 }
2697 else
2698 {
2529 api_ready (aTHX_ cb); 2699 api_ready (aTHX_ cb);
2530 sv_setiv (cb, 0); /* signal waiter */ 2700 sv_setiv (cb, 0); /* signal waiter */
2701 }
2702
2531 SvREFCNT_dec (cb); 2703 SvREFCNT_dec (cb);
2532 2704
2533 --count; 2705 --count;
2534 } 2706 }
2535} 2707}
2544static void 2716static void
2545slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2717slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2546{ 2718{
2547 AV *av = (AV *)SvRV (arg [0]); 2719 AV *av = (AV *)SvRV (arg [0]);
2548 2720
2721 if (items >= 2)
2722 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2549 if (SvIVX (AvARRAY (av)[0])) 2726 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else if (SvIVX (AvARRAY (av)[0]))
2550 { 2733 {
2551 SvIVX (AvARRAY (av)[0]) = 0; 2734 SvIVX (AvARRAY (av)[0]) = 0;
2552 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
2553 frame->check = slf_check_nop; 2736 frame->check = slf_check_nop;
2554 } 2737 }
2555 else 2738 else
2556 { 2739 {
2557 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2740 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2558 2741
2559 av_push (av, waiter); 2742 av_push (av, waiter);
2560 2743
2561 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2744 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2562 frame->prepare = prepare_schedule; 2745 frame->prepare = prepare_schedule;
2580 2763
2581static void 2764static void
2582coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2583{ 2766{
2584 dXSARGS; 2767 dXSARGS;
2585 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2586 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2587 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2588 2771
2589 av_extend (state, items - 1); 2772 av_extend (state, items - 1);
2590 2773
2704 2887
2705 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2706 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2707 2890
2708 /* now push the callback closure */ 2891 /* now push the callback closure */
2709 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2710 2893
2711 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2712 PUTBACK; 2895 PUTBACK;
2713 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2714 } 2897 }
2732/*****************************************************************************/ 2915/*****************************************************************************/
2733 2916
2734#if CORO_CLONE 2917#if CORO_CLONE
2735# include "clone.c" 2918# include "clone.c"
2736#endif 2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2737 2978
2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2739 2980
2740PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2741 2982
2746 coro_thx = PERL_GET_CONTEXT; 2987 coro_thx = PERL_GET_CONTEXT;
2747# endif 2988# endif
2748#endif 2989#endif
2749 BOOT_PAGESIZE; 2990 BOOT_PAGESIZE;
2750 2991
2992 cctx_current = cctx_new_empty ();
2993
2751 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2994 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2752 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2995 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2753 2996
2754 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2997 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2755 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2998 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2799 3042
2800 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2801 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2802 3045
2803 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2804 } 3050 }
2805 3051
2806 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2807} 3053}
2808 3054
2809SV * 3055SV *
2810new (char *klass, ...) 3056new (SV *klass, ...)
2811 ALIAS: 3057 ALIAS:
2812 Coro::new = 1 3058 Coro::new = 1
2813 CODE: 3059 CODE:
2814{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2815 struct coro *coro; 3061 OUTPUT:
2816 MAGIC *mg;
2817 HV *hv;
2818 CV *cb;
2819 int i;
2820
2821 if (items > 1)
2822 {
2823 cb = coro_sv_2cv (aTHX_ ST (1));
2824
2825 if (!ix)
2826 {
2827 if (CvISXSUB (cb))
2828 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2829
2830 if (!CvROOT (cb))
2831 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2832 }
2833 }
2834
2835 Newz (0, coro, 1, struct coro);
2836 coro->args = newAV ();
2837 coro->flags = CF_NEW;
2838
2839 if (coro_first) coro_first->prev = coro;
2840 coro->next = coro_first;
2841 coro_first = coro;
2842
2843 coro->hv = hv = newHV ();
2844 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2845 mg->mg_flags |= MGf_DUP;
2846 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2847
2848 if (items > 1)
2849 {
2850 av_extend (coro->args, items - 1 + ix - 1);
2851
2852 if (ix)
2853 {
2854 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2855 cb = cv_coro_run;
2856 }
2857
2858 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2859
2860 for (i = 2; i < items; i++)
2861 av_push (coro->args, newSVsv (ST (i)));
2862 }
2863}
2864 OUTPUT:
2865 RETVAL 3062 RETVAL
2866 3063
2867void 3064void
2868transfer (...) 3065transfer (...)
2869 PROTOTYPE: $$ 3066 PROTOTYPE: $$
2881_exit (int code) 3078_exit (int code)
2882 PROTOTYPE: $ 3079 PROTOTYPE: $
2883 CODE: 3080 CODE:
2884 _exit (code); 3081 _exit (code);
2885 3082
2886#if CORO_CLONE
2887
2888SV * 3083SV *
2889clone (Coro::State coro) 3084clone (Coro::State coro)
2890 CODE: 3085 CODE:
2891{ 3086{
3087#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3088 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3089 MAGIC *mg;
2894 /* TODO: too much duplication */ 3090 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3091 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3092 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3093 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv)); 3094 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3095#else
3096 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3097#endif
2899} 3098}
2900 OUTPUT: 3099 OUTPUT:
2901 RETVAL 3100 RETVAL
2902
2903#endif
2904 3101
2905int 3102int
2906cctx_stacksize (int new_stacksize = 0) 3103cctx_stacksize (int new_stacksize = 0)
2907 PROTOTYPE: ;$ 3104 PROTOTYPE: ;$
2908 CODE: 3105 CODE:
2958 eval = 1 3155 eval = 1
2959 CODE: 3156 CODE:
2960{ 3157{
2961 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3158 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2962 { 3159 {
2963 struct coro temp; 3160 struct coro *current = SvSTATE_current;
2964 3161
2965 if (!(coro->flags & CF_RUNNING)) 3162 if (current != coro)
2966 { 3163 {
2967 PUTBACK; 3164 PUTBACK;
2968 save_perl (aTHX_ &temp); 3165 save_perl (aTHX_ current);
2969 load_perl (aTHX_ coro); 3166 load_perl (aTHX_ coro);
3167 SPAGAIN;
2970 } 3168 }
2971 3169
2972 {
2973 dSP;
2974 ENTER;
2975 SAVETMPS;
2976 PUTBACK;
2977 PUSHSTACK; 3170 PUSHSTACK;
3171
2978 PUSHMARK (SP); 3172 PUSHMARK (SP);
3173 PUTBACK;
2979 3174
2980 if (ix) 3175 if (ix)
2981 eval_sv (coderef, 0); 3176 eval_sv (coderef, 0);
2982 else 3177 else
2983 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3178 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2984 3179
2985 POPSTACK; 3180 POPSTACK;
2986 SPAGAIN; 3181 SPAGAIN;
2987 FREETMPS;
2988 LEAVE;
2989 PUTBACK;
2990 }
2991 3182
2992 if (!(coro->flags & CF_RUNNING)) 3183 if (current != coro)
2993 { 3184 {
3185 PUTBACK;
2994 save_perl (aTHX_ coro); 3186 save_perl (aTHX_ coro);
2995 load_perl (aTHX_ &temp); 3187 load_perl (aTHX_ current);
2996 SPAGAIN; 3188 SPAGAIN;
2997 } 3189 }
2998 } 3190 }
2999} 3191}
3000 3192
3004 ALIAS: 3196 ALIAS:
3005 is_ready = CF_READY 3197 is_ready = CF_READY
3006 is_running = CF_RUNNING 3198 is_running = CF_RUNNING
3007 is_new = CF_NEW 3199 is_new = CF_NEW
3008 is_destroyed = CF_DESTROYED 3200 is_destroyed = CF_DESTROYED
3201 is_suspended = CF_SUSPENDED
3009 CODE: 3202 CODE:
3010 RETVAL = boolSV (coro->flags & ix); 3203 RETVAL = boolSV (coro->flags & ix);
3011 OUTPUT: 3204 OUTPUT:
3012 RETVAL 3205 RETVAL
3013 3206
3017 CODE: 3210 CODE:
3018{ 3211{
3019 struct coro *current = SvSTATE_current; 3212 struct coro *current = SvSTATE_current;
3020 SV **throwp = self == current ? &CORO_THROW : &self->except; 3213 SV **throwp = self == current ? &CORO_THROW : &self->except;
3021 SvREFCNT_dec (*throwp); 3214 SvREFCNT_dec (*throwp);
3215 SvGETMAGIC (throw);
3022 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3023} 3217}
3024 3218
3025void 3219void
3026api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3029 3223
3030SV * 3224SV *
3031has_cctx (Coro::State coro) 3225has_cctx (Coro::State coro)
3032 PROTOTYPE: $ 3226 PROTOTYPE: $
3033 CODE: 3227 CODE:
3034 RETVAL = boolSV (!!coro->cctx); 3228 /* maybe manage the running flag differently */
3229 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3035 OUTPUT: 3230 OUTPUT:
3036 RETVAL 3231 RETVAL
3037 3232
3038int 3233int
3039is_traced (Coro::State coro) 3234is_traced (Coro::State coro)
3059 3254
3060void 3255void
3061force_cctx () 3256force_cctx ()
3062 PROTOTYPE: 3257 PROTOTYPE:
3063 CODE: 3258 CODE:
3064 SvSTATE_current->cctx->idle_sp = 0; 3259 cctx_current->idle_sp = 0;
3065 3260
3066void 3261void
3067swap_defsv (Coro::State self) 3262swap_defsv (Coro::State self)
3068 PROTOTYPE: $ 3263 PROTOTYPE: $
3069 ALIAS: 3264 ALIAS:
3077 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3272 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3078 3273
3079 SV *tmp = *src; *src = *dst; *dst = tmp; 3274 SV *tmp = *src; *src = *dst; *dst = tmp;
3080 } 3275 }
3081 3276
3277void
3278cancel (Coro::State self)
3279 CODE:
3280 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
3082 3320
3083MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
3084 3322
3085BOOT: 3323BOOT:
3086{ 3324{
3087 int i;
3088
3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3092 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3093 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3094 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3330 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3331 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3332 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3097 3334
3098 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3099 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3100 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3337 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3101 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3102 3339
3103 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
3104 3341
3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3107 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3108 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3345 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3109 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3346 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3110 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3347 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3111
3112 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3113 coro_ready[i] = newAV ();
3114 3348
3115 { 3349 {
3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3350 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3117 3351
3118 coroapi.schedule = api_schedule; 3352 coroapi.schedule = api_schedule;
3128 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
3129 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
3130 } 3364 }
3131} 3365}
3132 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3133void 3376void
3134terminate (...) 3377terminate (...)
3135 CODE: 3378 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137 3380
3157 3400
3158void 3401void
3159cede_notself (...) 3402cede_notself (...)
3160 CODE: 3403 CODE:
3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3404 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3162
3163void
3164_cancel (Coro::State self)
3165 CODE:
3166 coro_state_destroy (aTHX_ self);
3167 coro_call_on_destroy (aTHX_ self);
3168 3405
3169void 3406void
3170_set_current (SV *current) 3407_set_current (SV *current)
3171 PROTOTYPE: $ 3408 PROTOTYPE: $
3172 CODE: 3409 CODE:
3176void 3413void
3177_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
3178 PROTOTYPE: $ 3415 PROTOTYPE: $
3179 CODE: 3416 CODE:
3180 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
3181 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
3182 3429
3183int 3430int
3184prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
3185 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
3186 ALIAS: 3433 ALIAS:
3192 if (items > 1) 3439 if (items > 1)
3193 { 3440 {
3194 if (ix) 3441 if (ix)
3195 newprio = coro->prio - newprio; 3442 newprio = coro->prio - newprio;
3196 3443
3197 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3444 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3198 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3445 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3199 3446
3200 coro->prio = newprio; 3447 coro->prio = newprio;
3201 } 3448 }
3202} 3449}
3203 OUTPUT: 3450 OUTPUT:
3218 RETVAL = coro_nready; 3465 RETVAL = coro_nready;
3219 OUTPUT: 3466 OUTPUT:
3220 RETVAL 3467 RETVAL
3221 3468
3222void 3469void
3470suspend (Coro::State self)
3471 PROTOTYPE: $
3472 CODE:
3473 self->flags |= CF_SUSPENDED;
3474
3475void
3476resume (Coro::State self)
3477 PROTOTYPE: $
3478 CODE:
3479 self->flags &= ~CF_SUSPENDED;
3480
3481void
3223_pool_handler (...) 3482_pool_handler (...)
3224 CODE: 3483 CODE:
3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3484 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3226 3485
3227void 3486void
3238 for (i = 1; i < items; ++i) 3497 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i))); 3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240 3499
3241 if ((SV *)hv == &PL_sv_undef) 3500 if ((SV *)hv == &PL_sv_undef)
3242 { 3501 {
3243 PUSHMARK (SP); 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3244 EXTEND (SP, 2);
3245 PUSHs (sv_Coro);
3246 PUSHs ((SV *)cv_pool_handler);
3247 PUTBACK;
3248 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3249 SPAGAIN;
3250
3251 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3504 SvREFCNT_dec (sv);
3252 } 3505 }
3253 3506
3254 { 3507 {
3255 struct coro *coro = SvSTATE_hv (hv); 3508 struct coro *coro = SvSTATE_hv (hv);
3256 3509
3280rouse_wait (...) 3533rouse_wait (...)
3281 PROTOTYPE: ;$ 3534 PROTOTYPE: ;$
3282 PPCODE: 3535 PPCODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3536 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3284 3537
3538void
3539on_enter (SV *block)
3540 ALIAS:
3541 on_leave = 1
3542 PROTOTYPE: &
3543 CODE:
3544{
3545 struct coro *coro = SvSTATE_current;
3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3547
3548 block = s_get_cv_croak (block);
3549
3550 if (!*avp)
3551 *avp = newAV ();
3552
3553 av_push (*avp, SvREFCNT_inc (block));
3554
3555 if (!ix)
3556 on_enterleave_call (aTHX_ block);
3557
3558 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3559 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3560 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3561}
3562
3285 3563
3286MODULE = Coro::State PACKAGE = PerlIO::cede 3564MODULE = Coro::State PACKAGE = PerlIO::cede
3287 3565
3288BOOT: 3566BOOT:
3289 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3567 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3292MODULE = Coro::State PACKAGE = Coro::Semaphore 3570MODULE = Coro::State PACKAGE = Coro::Semaphore
3293 3571
3294SV * 3572SV *
3295new (SV *klass, SV *count = 0) 3573new (SV *klass, SV *count = 0)
3296 CODE: 3574 CODE:
3575{
3576 int semcnt = 1;
3577
3578 if (count)
3579 {
3580 SvGETMAGIC (count);
3581
3582 if (SvOK (count))
3583 semcnt = SvIV (count);
3584 }
3585
3297 RETVAL = sv_bless ( 3586 RETVAL = sv_bless (
3298 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3587 coro_waitarray_new (aTHX_ semcnt),
3299 GvSTASH (CvGV (cv)) 3588 GvSTASH (CvGV (cv))
3300 ); 3589 );
3590}
3301 OUTPUT: 3591 OUTPUT:
3302 RETVAL 3592 RETVAL
3303 3593
3304# helper for Coro::Channel 3594# helper for Coro::Channel and others
3305SV * 3595SV *
3306_alloc (int count) 3596_alloc (int count)
3307 CODE: 3597 CODE:
3308 RETVAL = coro_waitarray_new (aTHX_ count); 3598 RETVAL = coro_waitarray_new (aTHX_ count);
3309 OUTPUT: 3599 OUTPUT:
3367 for (i = 1; i <= wcount; ++i) 3657 for (i = 1; i <= wcount; ++i)
3368 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3658 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3369 } 3659 }
3370} 3660}
3371 3661
3662MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3663
3664void
3665_may_delete (SV *sem, int count, int extra_refs)
3666 PPCODE:
3667{
3668 AV *av = (AV *)SvRV (sem);
3669
3670 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3671 && AvFILLp (av) == 0 /* no waiters, just count */
3672 && SvIV (AvARRAY (av)[0]) == count)
3673 XSRETURN_YES;
3674
3675 XSRETURN_NO;
3676}
3677
3372MODULE = Coro::State PACKAGE = Coro::Signal 3678MODULE = Coro::State PACKAGE = Coro::Signal
3373 3679
3374SV * 3680SV *
3375new (SV *klass) 3681new (SV *klass)
3376 CODE: 3682 CODE:
3447 3753
3448void 3754void
3449_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
3450 CODE: 3756 CODE:
3451{ 3757{
3452 CV *req_cv = coro_sv_2cv (aTHX_ req); 3758 SV *req_cv = s_get_cv_croak (req);
3453 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3455 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
3456 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3457} 3763}
3458 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines