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.383 by root, Sun Feb 13 04:39:16 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
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 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
117#endif 67#endif
118 68
119#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
133#else 83#else
134# define dSTACKLEVEL volatile void *stacklevel 84# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 85# define STACKLEVEL ((void *)&stacklevel)
136#endif 86#endif
137 87
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 88#define IN_DESTRUCT PL_dirty
139 89
140#if __GNUC__ >= 3 90#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 93# define INLINE static inline
144#else 94#else
145# define attribute(x) 95# define attribute(x)
146# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
147# define INLINE static 97# define INLINE static
… …
159# if CORO_PTHREAD 109# if CORO_PTHREAD
160static void *coro_thx; 110static void *coro_thx;
161# endif 111# endif
162#endif 112#endif
163 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
164static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
165 126
166/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
169 130
… …
175static HV *coro_state_stash, *coro_stash; 136static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 137static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 138
178static AV *av_destroy; /* destruction queue */ 139static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 140static SV *sv_manager; /* the manager coro */
141static SV *sv_idle; /* $Coro::idle */
180 142
181static GV *irsgv; /* $/ */ 143static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 144static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 145static SV *rv_diehook;
184static SV *rv_warnhook; 146static SV *rv_warnhook;
… …
189static SV *sv_pool_size; 151static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 152static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 153static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 154static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 155static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 156
196/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
197static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
198 165
199static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
201 168
202enum { 169enum {
… …
237enum { 204enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
242}; 210};
243 211
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 213typedef struct
246{ 214{
247 SV *defsv; 215 SV *defsv;
248 AV *defav; 216 AV *defav;
249 SV *errsv; 217 SV *errsv;
250 SV *irsgv; 218 SV *irsgv;
219 HV *hinthv;
251#define VAR(name,type) type name; 220#define VAR(name,type) type name;
252# include "state.h" 221# include "state.h"
253#undef VAR 222#undef VAR
254} perl_slots; 223} perl_slots;
255 224
… …
257 226
258/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
259struct coro { 228struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
262 234
263 /* state data */ 235 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 237 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
… …
283 /* async_pool */ 255 /* async_pool */
284 SV *saved_deffh; 256 SV *saved_deffh;
285 SV *invoke_cb; 257 SV *invoke_cb;
286 AV *invoke_av; 258 AV *invoke_av;
287 259
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
269
288 /* linked list */ 270 /* linked list */
289 struct coro *next, *prev; 271 struct coro *next, *prev;
290}; 272};
291 273
292typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
… …
297/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
299 281
300/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
301 283
302#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
308 290
309/* for Coro.pm */ 291/* for Coro.pm */
310static SV *coro_current; 292static SV *coro_current;
311static SV *coro_readyhook; 293static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 296static struct coro *coro_first;
315#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
316 318
317/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
318 320
319static SV * 321static SV *
320coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
344 get_hv (name, create); 346 get_hv (name, create);
345#endif 347#endif
346 return get_hv (name, create); 348 return get_hv (name, create);
347} 349}
348 350
349/* may croak */ 351INLINE void
350INLINE CV * 352coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 353{
354#ifdef coro_clock_gettime
355 struct timespec ts;
356
357 ts.tv_sec = ts.tv_nsec = 0;
358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
360
361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
396}
397
398/*****************************************************************************/
399/* magic glue */
400
401#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext
403
404#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \
407 : mg_find (sv, type))
408
409#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \
412 : 0)
413
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416
417INLINE struct coro *
418SvSTATE_ (pTHX_ SV *coro)
419{
353 HV *st; 420 HV *stash;
354 GV *gvp; 421 MAGIC *mg;
355 return sv_2cv (sv, &st, &gvp, 0); 422
423 if (SvROK (coro))
424 coro = SvRV (coro);
425
426 if (expect_false (SvTYPE (coro) != SVt_PVHV))
427 croak ("Coro::State object required");
428
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr;
356} 439}
440
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442
443/* faster than SvSTATE, but expects a coroutine hv */
444#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446
447/*****************************************************************************/
448/* padlist management and caching */
357 449
358static AV * 450static AV *
359coro_derive_padlist (pTHX_ CV *cv) 451coro_derive_padlist (pTHX_ CV *cv)
360{ 452{
361 AV *padlist = CvPADLIST (cv); 453 AV *padlist = CvPADLIST (cv);
… …
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 462#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 464 --AvFILLp (padlist);
373 465
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 467 av_store (newpadlist, 1, (SV *)newpad);
376 468
377 return newpadlist; 469 return newpadlist;
378} 470}
379 471
380static void 472static void
381free_padlist (pTHX_ AV *padlist) 473free_padlist (pTHX_ AV *padlist)
382{ 474{
383 /* may be during global destruction */ 475 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 476 if (!IN_DESTRUCT)
385 { 477 {
386 I32 i = AvFILLp (padlist); 478 I32 i = AvFILLp (padlist);
387 while (i >= 0) 479
480 while (i > 0) /* special-case index 0 */
388 { 481 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 482 /* we try to be extra-careful here */
390 if (svp) 483 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 484 I32 j = AvFILLp (av);
392 SV *sv; 485
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 486 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]);
488
489 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 490 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 491 }
399 492
493 SvREFCNT_dec (AvARRAY (padlist)[0]);
494
495 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 496 SvREFCNT_dec ((SV*)padlist);
401 } 497 }
402} 498}
403 499
404static int 500static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 502{
407 AV *padlist; 503 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
409 509
410 /* casting is fun. */ 510 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
413 513
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 515
416 return 0; 516 return 0;
417} 517}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 518
422static MGVTBL coro_cv_vtbl = { 519static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 520 0, 0, 0, 0,
424 coro_cv_free 521 coro_cv_free
425}; 522};
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 523
470/* the next two functions merely cache the padlists */ 524/* the next two functions merely cache the padlists */
471static void 525static void
472get_padlist (pTHX_ CV *cv) 526get_padlist (pTHX_ CV *cv)
473{ 527{
… …
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 556
503 av = (AV *)mg->mg_obj; 557 av = (AV *)mg->mg_obj;
504 558
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 560 av_extend (av, AvFILLp (av) + 1);
507 561
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 563}
510 564
511/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
618static void
619on_enterleave_call (pTHX_ SV *cb);
512 620
513static void 621static void
514load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
515{ 623{
516 perl_slots *slot = c->slot; 624 perl_slots *slot = c->slot;
517 c->slot = 0; 625 c->slot = 0;
518 626
519 PL_mainstack = c->mainstack; 627 PL_mainstack = c->mainstack;
520 628
521 GvSV (PL_defgv) = slot->defsv; 629 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 630 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 631 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
525 634
526 #define VAR(name,type) PL_ ## name = slot->name; 635 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 636 # include "state.h"
528 #undef VAR 637 #undef VAR
529 638
… …
543 PUTBACK; 652 PUTBACK;
544 } 653 }
545 654
546 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 656 CORO_THROW = c->except;
657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
666 if (expect_false (c->on_enter))
667 {
668 int i;
669
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 }
673
674 SWAP_SVS (c);
548} 675}
549 676
550static void 677static void
551save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
552{ 679{
680 SWAP_SVS (c);
681
682 if (expect_false (c->on_leave))
683 {
684 int i;
685
686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
696 }
697
553 c->except = CORO_THROW; 698 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
555 700
556 { 701 {
557 dSP; 702 dSP;
… …
570 { 715 {
571 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
572 { 717 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
574 719
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 721 {
577 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
578 723
579 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
580 { 725 {
… …
604 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
608 { 753 {
609 int i; 754 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 756 CXINC;
612 } 757 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 759
615 c->mainstack = PL_mainstack; 760 c->mainstack = PL_mainstack;
616 761
617 { 762 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 764
620 slot->defav = GvAV (PL_defgv); 765 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 766 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 767 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
624 770
625 #define VAR(name,type) slot->name = PL_ ## name; 771 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 772 # include "state.h"
627 #undef VAR 773 #undef VAR
628 } 774 }
… …
755#endif 901#endif
756 902
757/* 903/*
758 * This overrides the default magic get method of %SIG elements. 904 * 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 905 * 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 906 * and instead of trying to save and restore the hash elements, we just provide
761 * readback here. 907 * 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 */ 908 */
766static int 909static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 911{
769 const char *s = MgPV_nolen_const (mg); 912 const char *s = MgPV_nolen_const (mg);
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 966
824 if (svp) 967 if (svp)
825 { 968 {
826 SV *old = *svp; 969 SV *old = *svp;
827 *svp = newSVsv (sv); 970 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 971 SvREFCNT_dec (old);
829 return 0; 972 return 0;
830 } 973 }
831 } 974 }
832 975
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 993slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 994{
852 return 1; 995 return 1;
853} 996}
854 997
855static UNOP coro_setup_op; 998static UNOP init_perl_op;
856 999
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
859{ 1002{
860 /* 1003 /*
861 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
862 */ 1005 */
863 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
864 1007
865 PL_runops = RUNOPS_DEFAULT; 1008 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1009 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1010 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1011 PL_comppad = 0;
1012 PL_comppad_name = 0;
1013 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1015 PL_curpm = 0;
870 PL_curpad = 0; 1016 PL_curpad = 0;
871 PL_localizing = 0; 1017 PL_localizing = 0;
872 PL_dirty = 0;
873 PL_restartop = 0; 1018 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1019#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1020 PL_parser = 0;
876#endif 1021#endif
1022 PL_hints = 0;
877 1023
878 /* recreate the die/warn hooks */ 1024 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1025 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); 1026 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
881 1027
882 GvSV (PL_defgv) = newSV (0); 1028 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1029 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1030 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1031 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1032 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 1033 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1034 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1035
889 { 1036 {
890 dSP; 1037 dSP;
… …
907 */ 1054 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1055 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
909 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1056 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
910 1057
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1058 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
912 coro_setup_op.op_next = PL_op; 1059 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1060 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1061 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1062 /* no flags etc. required, as an init function won't be called */
916 1063
917 PL_op = (OP *)&coro_setup_op; 1064 PL_op = (OP *)&init_perl_op;
918 1065
919 /* copy throw, in case it was set before coro_setup */ 1066 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1067 CORO_THROW = coro->except;
921}
922 1068
1069 SWAP_SVS (coro);
1070
1071 if (expect_false (enable_times))
1072 {
1073 coro_times_update ();
1074 coro_times_sub (coro);
1075 }
1076}
1077
923static void 1078static void
924coro_destruct (pTHX_ struct coro *coro) 1079coro_unwind_stacks (pTHX)
925{ 1080{
926 if (!IN_DESTRUCT) 1081 if (!IN_DESTRUCT)
927 { 1082 {
928 /* restore all saved variables and stuff */ 1083 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1084 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1092 POPSTACK_TO (PL_mainstack);
938 1093
939 /* unwind main stack */ 1094 /* unwind main stack */
940 dounwind (-1); 1095 dounwind (-1);
941 } 1096 }
1097}
942 1098
943 SvREFCNT_dec (GvSV (PL_defgv)); 1099static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1100destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1101{
946 SvREFCNT_dec (PL_defoutgv); 1102 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1103
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1104 {
1105 struct coro *current = SvSTATE_current;
1106
1107 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1108
1109 save_perl (aTHX_ current);
1110 load_perl (aTHX_ coro);
1111
1112 coro_unwind_stacks (aTHX);
1113 coro_destruct_stacks (aTHX);
1114
1115 /* restore swapped sv's */
1116 SWAP_SVS (coro);
1117
1118 // now save some sv's to be free'd later
1119 svf [0] = GvSV (PL_defgv);
1120 svf [1] = (SV *)GvAV (PL_defgv);
1121 svf [2] = GvSV (PL_errgv);
1122 svf [3] = (SV *)PL_defoutgv;
1123 svf [4] = PL_rs;
1124 svf [5] = GvSV (irsgv);
1125 svf [6] = (SV *)GvHV (PL_hintgv);
1126 svf [7] = PL_diehook;
1127 svf [8] = PL_warnhook;
1128 assert (9 == sizeof (svf) / sizeof (*svf));
1129
1130 load_perl (aTHX_ current);
1131 }
1132
1133 {
1134 unsigned int i;
1135
1136 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1137 SvREFCNT_dec (svf [i]);
1138
953 SvREFCNT_dec (coro->saved_deffh); 1139 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1140 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1141 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1142 SvREFCNT_dec (coro->invoke_av);
957 1143 }
958 coro_destruct_stacks (aTHX);
959} 1144}
960 1145
961INLINE void 1146INLINE void
962free_coro_mortal (pTHX) 1147free_coro_mortal (pTHX)
963{ 1148{
… …
1160 /* somebody or something will hit me for both perl_run and PL_restartop */ 1345 /* somebody or something will hit me for both perl_run and PL_restartop */
1161 PL_restartop = PL_op; 1346 PL_restartop = PL_op;
1162 perl_run (PL_curinterp); 1347 perl_run (PL_curinterp);
1163 /* 1348 /*
1164 * Unfortunately, there is no way to get at the return values of the 1349 * Unfortunately, there is no way to get at the return values of the
1165 * coro body here, as perl_run destroys these 1350 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1351 * runtime errors here, as this is just a random interpreter, not a thread.
1166 */ 1352 */
1167 1353
1168 /* 1354 /*
1169 * If perl-run returns we assume exit() was being called or the coro 1355 * 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) 1356 * 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 1357 * 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" 1358 * bootstrap-time "top" top_env, as we cannot restore the "main"
1173 * coroutine as Coro has no such concept 1359 * coroutine as Coro has no such concept.
1360 * This actually isn't valid with the pthread backend, but OSes requiring
1361 * that backend are too broken to do it in a standards-compliant way.
1174 */ 1362 */
1175 PL_top_env = main_top_env; 1363 PL_top_env = main_top_env;
1176 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1364 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1177 } 1365 }
1178} 1366}
… …
1255cctx_destroy (coro_cctx *cctx) 1443cctx_destroy (coro_cctx *cctx)
1256{ 1444{
1257 if (!cctx) 1445 if (!cctx)
1258 return; 1446 return;
1259 1447
1260 assert (cctx != cctx_current);//D temporary 1448 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1261 1449
1262 --cctx_count; 1450 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1451 coro_destroy (&cctx->cctx);
1264 1452
1265 /* coro_transfer creates new, empty cctx's */ 1453 /* coro_transfer creates new, empty cctx's */
… …
1329 /* TODO: throwing up here is considered harmful */ 1517 /* TODO: throwing up here is considered harmful */
1330 1518
1331 if (expect_true (prev != next)) 1519 if (expect_true (prev != next))
1332 { 1520 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1521 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,"); 1522 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1335 1523
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)) 1524 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,"); 1525 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1341 1526
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1527#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1528 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,"); 1529 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1345#endif 1530#endif
… …
1378 if (expect_false (next->flags & CF_NEW)) 1563 if (expect_false (next->flags & CF_NEW))
1379 { 1564 {
1380 /* need to start coroutine */ 1565 /* need to start coroutine */
1381 next->flags &= ~CF_NEW; 1566 next->flags &= ~CF_NEW;
1382 /* setup coroutine call */ 1567 /* setup coroutine call */
1383 coro_setup (aTHX_ next); 1568 init_perl (aTHX_ next);
1384 } 1569 }
1385 else 1570 else
1386 load_perl (aTHX_ next); 1571 load_perl (aTHX_ next);
1387 1572
1388 /* possibly untie and reuse the cctx */ 1573 /* possibly untie and reuse the cctx */
… …
1393 )) 1578 ))
1394 { 1579 {
1395 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1580 /* 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)); 1581 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1397 1582
1398 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1583 /* 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 */ 1584 /* without this the next cctx_get might destroy the running cctx while still in use */
1400 if (expect_false (CCTX_EXPIRED (cctx_current))) 1585 if (expect_false (CCTX_EXPIRED (cctx_current)))
1401 if (!next->cctx) 1586 if (expect_true (!next->cctx))
1402 next->cctx = cctx_get (aTHX); 1587 next->cctx = cctx_get (aTHX);
1403 1588
1404 cctx_put (cctx_current); 1589 cctx_put (cctx_current);
1405 assert (!prev->cctx);//D temporary
1406 } 1590 }
1407 else 1591 else
1408 prev->cctx = cctx_current; 1592 prev->cctx = cctx_current;
1409 1593
1410 ++next->usecount; 1594 ++next->usecount;
… …
1434coro_state_destroy (pTHX_ struct coro *coro) 1618coro_state_destroy (pTHX_ struct coro *coro)
1435{ 1619{
1436 if (coro->flags & CF_DESTROYED) 1620 if (coro->flags & CF_DESTROYED)
1437 return 0; 1621 return 0;
1438 1622
1439 if (coro->on_destroy) 1623 if (coro->on_destroy && !PL_dirty)
1440 coro->on_destroy (aTHX_ coro); 1624 coro->on_destroy (aTHX_ coro);
1441 1625
1442 coro->flags |= CF_DESTROYED; 1626 coro->flags |= CF_DESTROYED;
1443 1627
1444 if (coro->flags & CF_READY) 1628 if (coro->flags & CF_READY)
… …
1448 --coro_nready; 1632 --coro_nready;
1449 } 1633 }
1450 else 1634 else
1451 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1635 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1452 1636
1453 if (coro->mainstack && coro->mainstack != main_mainstack) 1637 if (coro->mainstack
1454 { 1638 && coro->mainstack != main_mainstack
1455 struct coro temp; 1639 && coro->slot
1456 1640 && !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); 1641 destroy_perl (aTHX_ coro);
1461 1642
1462 coro_destruct (aTHX_ coro); 1643 if (coro->next) coro->next->prev = coro->prev;
1463 1644 if (coro->prev) coro->prev->next = coro->next;
1464 load_perl (aTHX_ &temp); 1645 if (coro == coro_first) coro_first = coro->next;
1465
1466 coro->slot = 0;
1467 }
1468 1646
1469 cctx_destroy (coro->cctx); 1647 cctx_destroy (coro->cctx);
1470 SvREFCNT_dec (coro->startcv); 1648 SvREFCNT_dec (coro->startcv);
1471 SvREFCNT_dec (coro->args); 1649 SvREFCNT_dec (coro->args);
1650 SvREFCNT_dec (coro->swap_sv);
1472 SvREFCNT_dec (CORO_THROW); 1651 SvREFCNT_dec (CORO_THROW);
1473
1474 if (coro->next) coro->next->prev = coro->prev;
1475 if (coro->prev) coro->prev->next = coro->next;
1476 if (coro == coro_first) coro_first = coro->next;
1477 1652
1478 return 1; 1653 return 1;
1479} 1654}
1480 1655
1481static int 1656static int
… …
1531 1706
1532 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1707 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1533 TRANSFER (ta, 1); 1708 TRANSFER (ta, 1);
1534} 1709}
1535 1710
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 ********************************************************************/ 1711/** Coro ********************************************************************/
1560 1712
1561INLINE void 1713INLINE void
1562coro_enq (pTHX_ struct coro *coro) 1714coro_enq (pTHX_ struct coro *coro)
1563{ 1715{
1564 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1716 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1565}
1566 1717
1567INLINE SV * 1718 SvREFCNT_inc_NN (coro->hv);
1719
1720 coro->next_ready = 0;
1721 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1722 ready [1] = coro;
1723}
1724
1725INLINE struct coro *
1568coro_deq (pTHX) 1726coro_deq (pTHX)
1569{ 1727{
1570 int prio; 1728 int prio;
1571 1729
1572 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1730 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1573 if (AvFILLp (coro_ready [prio]) >= 0) 1731 {
1574 return av_shift (coro_ready [prio]); 1732 struct coro **ready = coro_ready [prio];
1733
1734 if (ready [0])
1735 {
1736 struct coro *coro = ready [0];
1737 ready [0] = coro->next_ready;
1738 return coro;
1739 }
1740 }
1575 1741
1576 return 0; 1742 return 0;
1743}
1744
1745static void
1746invoke_sv_ready_hook_helper (void)
1747{
1748 dTHX;
1749 dSP;
1750
1751 ENTER;
1752 SAVETMPS;
1753
1754 PUSHMARK (SP);
1755 PUTBACK;
1756 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1757
1758 FREETMPS;
1759 LEAVE;
1577} 1760}
1578 1761
1579static int 1762static int
1580api_ready (pTHX_ SV *coro_sv) 1763api_ready (pTHX_ SV *coro_sv)
1581{ 1764{
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); 1765 struct coro *coro = SvSTATE (coro_sv);
1590 1766
1591 if (coro->flags & CF_READY) 1767 if (coro->flags & CF_READY)
1592 return 0; 1768 return 0;
1593 1769
1594 coro->flags |= CF_READY; 1770 coro->flags |= CF_READY;
1595 1771
1596 sv_hook = coro_nready ? 0 : coro_readyhook;
1597 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1598
1599 coro_enq (aTHX_ coro); 1772 coro_enq (aTHX_ coro);
1600 ++coro_nready;
1601 1773
1602 if (sv_hook) 1774 if (!coro_nready++)
1603 { 1775 if (coroapi.readyhook)
1604 dSP; 1776 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 1777
1620 return 1; 1778 return 1;
1621} 1779}
1622 1780
1623static int 1781static int
… …
1646static void 1804static void
1647prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1805prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1648{ 1806{
1649 for (;;) 1807 for (;;)
1650 { 1808 {
1651 SV *next_sv = coro_deq (aTHX); 1809 struct coro *next = coro_deq (aTHX);
1652 1810
1653 if (expect_true (next_sv)) 1811 if (expect_true (next))
1654 { 1812 {
1655 struct coro *next = SvSTATE_hv (next_sv);
1656
1657 /* cannot transfer to destroyed coros, skip and look for next */ 1813 /* cannot transfer to destroyed coros, skip and look for next */
1658 if (expect_false (next->flags & CF_DESTROYED)) 1814 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1659 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1815 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1660 else 1816 else
1661 { 1817 {
1662 next->flags &= ~CF_READY; 1818 next->flags &= ~CF_READY;
1663 --coro_nready; 1819 --coro_nready;
1664 1820
… …
1667 } 1823 }
1668 } 1824 }
1669 else 1825 else
1670 { 1826 {
1671 /* nothing to schedule: call the idle handler */ 1827 /* nothing to schedule: call the idle handler */
1828 if (SvROK (sv_idle)
1829 && SvOBJECT (SvRV (sv_idle)))
1830 {
1831 if (SvRV (sv_idle) == SvRV (coro_current))
1832 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1833
1834 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1835 api_ready (aTHX_ SvRV (sv_idle));
1836 --coro_nready;
1837 }
1838 else
1839 {
1840 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1672 dSP; 1841 dSP;
1673 1842
1674 ENTER; 1843 ENTER;
1675 SAVETMPS; 1844 SAVETMPS;
1676 1845
1677 PUSHMARK (SP); 1846 PUSHMARK (SP);
1678 PUTBACK; 1847 PUTBACK;
1679 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1848 call_sv (sv_idle, G_VOID | G_DISCARD);
1680 1849
1681 FREETMPS; 1850 FREETMPS;
1682 LEAVE; 1851 LEAVE;
1852 }
1683 } 1853 }
1684 } 1854 }
1685} 1855}
1686 1856
1687INLINE void 1857INLINE void
… …
1758static void 1928static void
1759api_trace (pTHX_ SV *coro_sv, int flags) 1929api_trace (pTHX_ SV *coro_sv, int flags)
1760{ 1930{
1761 struct coro *coro = SvSTATE (coro_sv); 1931 struct coro *coro = SvSTATE (coro_sv);
1762 1932
1933 if (coro->flags & CF_RUNNING)
1934 croak ("cannot enable tracing on a running coroutine, caught");
1935
1763 if (flags & CC_TRACE) 1936 if (flags & CC_TRACE)
1764 { 1937 {
1765 if (!coro->cctx) 1938 if (!coro->cctx)
1766 coro->cctx = cctx_new_run (); 1939 coro->cctx = cctx_new_run ();
1767 else if (!(coro->cctx->flags & CC_TRACE)) 1940 else if (!(coro->cctx->flags & CC_TRACE))
1768 croak ("cannot enable tracing on coroutine with custom stack,"); 1941 croak ("cannot enable tracing on coroutine with custom stack, caught");
1769 1942
1770 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1943 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1771 } 1944 }
1772 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1945 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1773 { 1946 {
… …
1818{ 1991{
1819 int i; 1992 int i;
1820 HV *hv = (HV *)SvRV (coro_current); 1993 HV *hv = (HV *)SvRV (coro_current);
1821 AV *av = newAV (); 1994 AV *av = newAV ();
1822 1995
1996 /* items are actually not so common, so optimise for this case */
1997 if (items)
1998 {
1823 av_extend (av, items - 1); 1999 av_extend (av, items - 1);
2000
1824 for (i = 0; i < items; ++i) 2001 for (i = 0; i < items; ++i)
1825 av_push (av, SvREFCNT_inc_NN (arg [i])); 2002 av_push (av, SvREFCNT_inc_NN (arg [i]));
2003 }
1826 2004
1827 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1828 2006
1829 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1830 api_ready (aTHX_ sv_manager); 2008 api_ready (aTHX_ sv_manager);
1831 2009
1832 frame->prepare = prepare_schedule; 2010 frame->prepare = prepare_schedule;
1833 frame->check = slf_check_repeat; 2011 frame->check = slf_check_repeat;
2012
2013 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/
1834} 2016}
1835 2017
1836/*****************************************************************************/ 2018/*****************************************************************************/
1837/* async pool handler */ 2019/* async pool handler */
1838 2020
… …
1916 2098
1917static void 2099static void
1918coro_rouse_callback (pTHX_ CV *cv) 2100coro_rouse_callback (pTHX_ CV *cv)
1919{ 2101{
1920 dXSARGS; 2102 dXSARGS;
1921 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)S_GENSUB_ARG;
1922 2104
1923 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1924 { 2106 {
1925 /* first call, set args */ 2107 /* first call, set args */
2108 SV *coro = SvRV (data);
1926 AV *av = newAV (); 2109 AV *av = newAV ();
1927 SV *coro = SvRV (data);
1928 2110
1929 SvRV_set (data, (SV *)av); 2111 SvRV_set (data, (SV *)av);
1930 api_ready (aTHX_ coro);
1931 SvREFCNT_dec (coro);
1932 2112
1933 /* better take a full copy of the arguments */ 2113 /* better take a full copy of the arguments */
1934 while (items--) 2114 while (items--)
1935 av_store (av, items, newSVsv (ST (items))); 2115 av_store (av, items, newSVsv (ST (items)));
2116
2117 api_ready (aTHX_ coro);
2118 SvREFCNT_dec (coro);
1936 } 2119 }
1937 2120
1938 XSRETURN_EMPTY; 2121 XSRETURN_EMPTY;
1939} 2122}
1940 2123
… …
1957 2140
1958 EXTEND (SP, AvFILLp (av) + 1); 2141 EXTEND (SP, AvFILLp (av) + 1);
1959 for (i = 0; i <= AvFILLp (av); ++i) 2142 for (i = 0; i <= AvFILLp (av); ++i)
1960 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2143 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1961 2144
1962 /* we have stolen the elements, so ste length to zero and free */ 2145 /* we have stolen the elements, so set length to zero and free */
1963 AvFILLp (av) = -1; 2146 AvFILLp (av) = -1;
1964 av_undef (av); 2147 av_undef (av);
1965 2148
1966 PUTBACK; 2149 PUTBACK;
1967 } 2150 }
… …
1991 || SvTYPE (SvRV (cb)) != SVt_PVCV 2174 || SvTYPE (SvRV (cb)) != SVt_PVCV
1992 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2175 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1993 croak ("Coro::rouse_wait called with illegal callback argument,"); 2176 croak ("Coro::rouse_wait called with illegal callback argument,");
1994 2177
1995 { 2178 {
1996 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2179 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1997 SV *data = (SV *)GENSUB_ARG; 2180 SV *data = (SV *)S_GENSUB_ARG;
1998 2181
1999 frame->data = (void *)data; 2182 frame->data = (void *)data;
2000 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2183 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2001 frame->check = slf_check_rouse_wait; 2184 frame->check = slf_check_rouse_wait;
2002 } 2185 }
… …
2006coro_new_rouse_cb (pTHX) 2189coro_new_rouse_cb (pTHX)
2007{ 2190{
2008 HV *hv = (HV *)SvRV (coro_current); 2191 HV *hv = (HV *)SvRV (coro_current);
2009 struct coro *coro = SvSTATE_hv (hv); 2192 struct coro *coro = SvSTATE_hv (hv);
2010 SV *data = newRV_inc ((SV *)hv); 2193 SV *data = newRV_inc ((SV *)hv);
2011 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2194 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2012 2195
2013 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2196 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2014 SvREFCNT_dec (data); /* magicext increases the refcount */ 2197 SvREFCNT_dec (data); /* magicext increases the refcount */
2015 2198
2016 SvREFCNT_dec (coro->rouse_cb); 2199 SvREFCNT_dec (coro->rouse_cb);
… …
2241 if (PL_op->op_flags & OPf_STACKED) 2424 if (PL_op->op_flags & OPf_STACKED)
2242 { 2425 {
2243 if (items > slf_arga) 2426 if (items > slf_arga)
2244 { 2427 {
2245 slf_arga = items; 2428 slf_arga = items;
2246 free (slf_argv); 2429 Safefree (slf_argv);
2247 slf_argv = malloc (slf_arga * sizeof (SV *)); 2430 New (0, slf_argv, slf_arga, SV *);
2248 } 2431 }
2249 2432
2250 slf_argc = items; 2433 slf_argc = items;
2251 2434
2252 for (i = 0; i < items; ++i) 2435 for (i = 0; i < items; ++i)
… …
2257 2440
2258 PL_op->op_ppaddr = pp_slf; 2441 PL_op->op_ppaddr = pp_slf;
2259 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2442 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2260 2443
2261 PL_op = (OP *)&slf_restore; 2444 PL_op = (OP *)&slf_restore;
2445}
2446
2447/*****************************************************************************/
2448/* dynamic wind */
2449
2450static void
2451on_enterleave_call (pTHX_ SV *cb)
2452{
2453 dSP;
2454
2455 PUSHSTACK;
2456
2457 PUSHMARK (SP);
2458 PUTBACK;
2459 call_sv (cb, G_VOID | G_DISCARD);
2460 SPAGAIN;
2461
2462 POPSTACK;
2463}
2464
2465static SV *
2466coro_avp_pop_and_free (pTHX_ AV **avp)
2467{
2468 AV *av = *avp;
2469 SV *res = av_pop (av);
2470
2471 if (AvFILLp (av) < 0)
2472 {
2473 *avp = 0;
2474 SvREFCNT_dec (av);
2475 }
2476
2477 return res;
2478}
2479
2480static void
2481coro_pop_on_enter (pTHX_ void *coro)
2482{
2483 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2484 SvREFCNT_dec (cb);
2485}
2486
2487static void
2488coro_pop_on_leave (pTHX_ void *coro)
2489{
2490 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb));
2262} 2492}
2263 2493
2264/*****************************************************************************/ 2494/*****************************************************************************/
2265/* PerlIO::cede */ 2495/* PerlIO::cede */
2266 2496
… …
2340/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2341 2571
2342static SV * 2572static SV *
2343coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2344{ 2574{
2345 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2575 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2346 AV *av = newAV (); 2576 AV *av = newAV ();
2347 SV **ary; 2577 SV **ary;
2348 2578
2349 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2350 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
2351 AvALLOC (av) = ary; 2581 AvALLOC (av) = ary;
2582#if PERL_VERSION_ATLEAST (5,10,0)
2352 /*AvARRAY (av) = ary;*/ 2583 AvARRAY (av) = ary;
2584#else
2353 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2585 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2586 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2587 SvPVX ((SV *)av) = (char *)ary;
2588#endif
2354 AvMAX (av) = 1; 2589 AvMAX (av) = 1;
2355 AvFILLp (av) = 0; 2590 AvFILLp (av) = 0;
2356 ary [0] = newSViv (count); 2591 ary [0] = newSViv (count);
2357 2592
2358 return newRV_noinc ((SV *)av); 2593 return newRV_noinc ((SV *)av);
… …
2487{ 2722{
2488 if (items >= 2) 2723 if (items >= 2)
2489 { 2724 {
2490 /* callback form */ 2725 /* callback form */
2491 AV *av = (AV *)SvRV (arg [0]); 2726 AV *av = (AV *)SvRV (arg [0]);
2492 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2727 SV *cb_cv = s_get_cv_croak (arg [1]);
2493 2728
2494 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2495 2730
2496 if (SvIVX (AvARRAY (av)[0]) > 0) 2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2497 coro_semaphore_adjust (aTHX_ av, 0); 2732 coro_semaphore_adjust (aTHX_ av, 0);
2498 2733
2499 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
… …
2523 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2524 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2525 2760
2526 cb = av_shift (av); 2761 cb = av_shift (av);
2527 2762
2763 if (SvTYPE (cb) == SVt_PVCV)
2764 {
2765 dSP;
2766 PUSHMARK (SP);
2767 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2768 PUTBACK;
2769 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2770 }
2771 else
2772 {
2528 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2529 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2530 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2531 2778
2532 --count; 2779 --count;
2533 } 2780 }
2534} 2781}
… …
2543static void 2790static void
2544slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2791slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2545{ 2792{
2546 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2547 2794
2795 if (items >= 2)
2796 {
2797 SV *cb_cv = s_get_cv_croak (arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799
2548 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2802
2803 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop;
2805 }
2806 else if (SvIVX (AvARRAY (av)[0]))
2549 { 2807 {
2550 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2551 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2552 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2553 } 2811 }
2554 else 2812 else
2555 { 2813 {
2556 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2557 2815
2558 av_push (av, waiter); 2816 av_push (av, waiter);
2559 2817
2560 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2818 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2561 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
… …
2579 2837
2580static void 2838static void
2581coro_aio_callback (pTHX_ CV *cv) 2839coro_aio_callback (pTHX_ CV *cv)
2582{ 2840{
2583 dXSARGS; 2841 dXSARGS;
2584 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)S_GENSUB_ARG;
2585 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2586 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2587 2845
2588 av_extend (state, items - 1); 2846 av_extend (state, items - 1);
2589 2847
… …
2703 2961
2704 for (i = 0; i < items; ++i) 2962 for (i = 0; i < items; ++i)
2705 PUSHs (arg [i]); 2963 PUSHs (arg [i]);
2706 2964
2707 /* now push the callback closure */ 2965 /* now push the callback closure */
2708 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2966 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2709 2967
2710 /* now call the AIO function - we assume our request is uncancelable */ 2968 /* now call the AIO function - we assume our request is uncancelable */
2711 PUTBACK; 2969 PUTBACK;
2712 call_sv ((SV *)req, G_VOID | G_DISCARD); 2970 call_sv ((SV *)req, G_VOID | G_DISCARD);
2713 } 2971 }
2714 2972
2715 /* now that the requets is going, we loop toll we have a result */ 2973 /* now that the request is going, we loop till we have a result */
2716 frame->data = (void *)state; 2974 frame->data = (void *)state;
2717 frame->prepare = prepare_schedule; 2975 frame->prepare = prepare_schedule;
2718 frame->check = slf_check_aio_req; 2976 frame->check = slf_check_aio_req;
2719} 2977}
2720 2978
… …
2731/*****************************************************************************/ 2989/*****************************************************************************/
2732 2990
2733#if CORO_CLONE 2991#if CORO_CLONE
2734# include "clone.c" 2992# include "clone.c"
2735#endif 2993#endif
2994
2995/*****************************************************************************/
2996
2997static SV *
2998coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2999{
3000 SV *coro_sv;
3001 struct coro *coro;
3002 MAGIC *mg;
3003 HV *hv;
3004 SV *cb;
3005 int i;
3006
3007 if (argc > 0)
3008 {
3009 cb = s_get_cv_croak (argv [0]);
3010
3011 if (!is_coro)
3012 {
3013 if (CvISXSUB (cb))
3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3015
3016 if (!CvROOT (cb))
3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
3019 }
3020
3021 Newz (0, coro, 1, struct coro);
3022 coro->args = newAV ();
3023 coro->flags = CF_NEW;
3024
3025 if (coro_first) coro_first->prev = coro;
3026 coro->next = coro_first;
3027 coro_first = coro;
3028
3029 coro->hv = hv = newHV ();
3030 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3031 mg->mg_flags |= MGf_DUP;
3032 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3033
3034 if (argc > 0)
3035 {
3036 av_extend (coro->args, argc + is_coro - 1);
3037
3038 if (is_coro)
3039 {
3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
3046 for (i = 1; i < argc; i++)
3047 av_push (coro->args, newSVsv (argv [i]));
3048 }
3049
3050 return coro_sv;
3051}
2736 3052
2737MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3053MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2738 3054
2739PROTOTYPES: DISABLE 3055PROTOTYPES: DISABLE
2740 3056
… …
2800 3116
2801 if (!svp) croak ("Time::HiRes is required"); 3117 if (!svp) croak ("Time::HiRes is required");
2802 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3118 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2803 3119
2804 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3120 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3121
3122 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3123 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2805 } 3124 }
2806 3125
2807 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3126 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2808} 3127}
2809 3128
2810SV * 3129SV *
2811new (char *klass, ...) 3130new (SV *klass, ...)
2812 ALIAS: 3131 ALIAS:
2813 Coro::new = 1 3132 Coro::new = 1
2814 CODE: 3133 CODE:
2815{ 3134 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2816 struct coro *coro; 3135 OUTPUT:
2817 MAGIC *mg;
2818 HV *hv;
2819 CV *cb;
2820 int i;
2821
2822 if (items > 1)
2823 {
2824 cb = coro_sv_2cv (aTHX_ ST (1));
2825
2826 if (!ix)
2827 {
2828 if (CvISXSUB (cb))
2829 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2830
2831 if (!CvROOT (cb))
2832 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2833 }
2834 }
2835
2836 Newz (0, coro, 1, struct coro);
2837 coro->args = newAV ();
2838 coro->flags = CF_NEW;
2839
2840 if (coro_first) coro_first->prev = coro;
2841 coro->next = coro_first;
2842 coro_first = coro;
2843
2844 coro->hv = hv = newHV ();
2845 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2846 mg->mg_flags |= MGf_DUP;
2847 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2848
2849 if (items > 1)
2850 {
2851 av_extend (coro->args, items - 1 + ix - 1);
2852
2853 if (ix)
2854 {
2855 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2856 cb = cv_coro_run;
2857 }
2858
2859 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2860
2861 for (i = 2; i < items; i++)
2862 av_push (coro->args, newSVsv (ST (i)));
2863 }
2864}
2865 OUTPUT:
2866 RETVAL 3136 RETVAL
2867 3137
2868void 3138void
2869transfer (...) 3139transfer (...)
2870 PROTOTYPE: $$ 3140 PROTOTYPE: $$
… …
2887SV * 3157SV *
2888clone (Coro::State coro) 3158clone (Coro::State coro)
2889 CODE: 3159 CODE:
2890{ 3160{
2891#if CORO_CLONE 3161#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3162 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3163 MAGIC *mg;
2894 /* TODO: too much duplication */ 3164 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3165 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3166 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3167 mg->mg_flags |= MGf_DUP;
… …
2959 eval = 1 3229 eval = 1
2960 CODE: 3230 CODE:
2961{ 3231{
2962 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3232 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2963 { 3233 {
2964 struct coro temp; 3234 struct coro *current = SvSTATE_current;
2965 3235
2966 if (!(coro->flags & CF_RUNNING)) 3236 if (current != coro)
2967 { 3237 {
2968 PUTBACK; 3238 PUTBACK;
2969 save_perl (aTHX_ &temp); 3239 save_perl (aTHX_ current);
2970 load_perl (aTHX_ coro); 3240 load_perl (aTHX_ coro);
3241 SPAGAIN;
2971 } 3242 }
2972 3243
2973 {
2974 dSP;
2975 ENTER;
2976 SAVETMPS;
2977 PUTBACK;
2978 PUSHSTACK; 3244 PUSHSTACK;
3245
2979 PUSHMARK (SP); 3246 PUSHMARK (SP);
3247 PUTBACK;
2980 3248
2981 if (ix) 3249 if (ix)
2982 eval_sv (coderef, 0); 3250 eval_sv (coderef, 0);
2983 else 3251 else
2984 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3252 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2985 3253
2986 POPSTACK; 3254 POPSTACK;
2987 SPAGAIN; 3255 SPAGAIN;
2988 FREETMPS;
2989 LEAVE;
2990 PUTBACK;
2991 }
2992 3256
2993 if (!(coro->flags & CF_RUNNING)) 3257 if (current != coro)
2994 { 3258 {
3259 PUTBACK;
2995 save_perl (aTHX_ coro); 3260 save_perl (aTHX_ coro);
2996 load_perl (aTHX_ &temp); 3261 load_perl (aTHX_ current);
2997 SPAGAIN; 3262 SPAGAIN;
2998 } 3263 }
2999 } 3264 }
3000} 3265}
3001 3266
… …
3005 ALIAS: 3270 ALIAS:
3006 is_ready = CF_READY 3271 is_ready = CF_READY
3007 is_running = CF_RUNNING 3272 is_running = CF_RUNNING
3008 is_new = CF_NEW 3273 is_new = CF_NEW
3009 is_destroyed = CF_DESTROYED 3274 is_destroyed = CF_DESTROYED
3275 is_suspended = CF_SUSPENDED
3010 CODE: 3276 CODE:
3011 RETVAL = boolSV (coro->flags & ix); 3277 RETVAL = boolSV (coro->flags & ix);
3012 OUTPUT: 3278 OUTPUT:
3013 RETVAL 3279 RETVAL
3014 3280
3015void 3281void
3016throw (Coro::State self, SV *throw = &PL_sv_undef) 3282throw (Coro::State self, SV *exception = &PL_sv_undef)
3017 PROTOTYPE: $;$ 3283 PROTOTYPE: $;$
3018 CODE: 3284 CODE:
3019{ 3285{
3020 struct coro *current = SvSTATE_current; 3286 struct coro *current = SvSTATE_current;
3021 SV **throwp = self == current ? &CORO_THROW : &self->except; 3287 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3022 SvREFCNT_dec (*throwp); 3288 SvREFCNT_dec (*exceptionp);
3023 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3289 SvGETMAGIC (exception);
3290 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3024} 3291}
3025 3292
3026void 3293void
3027api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3294api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3028 PROTOTYPE: $;$ 3295 PROTOTYPE: $;$
… …
3079 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3346 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3080 3347
3081 SV *tmp = *src; *src = *dst; *dst = tmp; 3348 SV *tmp = *src; *src = *dst; *dst = tmp;
3082 } 3349 }
3083 3350
3351void
3352cancel (Coro::State self)
3353 CODE:
3354 coro_state_destroy (aTHX_ self);
3355 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3356
3357
3358SV *
3359enable_times (int enabled = enable_times)
3360 CODE:
3361{
3362 RETVAL = boolSV (enable_times);
3363
3364 if (enabled != enable_times)
3365 {
3366 enable_times = enabled;
3367
3368 coro_times_update ();
3369 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3370 }
3371}
3372 OUTPUT:
3373 RETVAL
3374
3375void
3376times (Coro::State self)
3377 PPCODE:
3378{
3379 struct coro *current = SvSTATE (coro_current);
3380
3381 if (expect_false (current == self))
3382 {
3383 coro_times_update ();
3384 coro_times_add (SvSTATE (coro_current));
3385 }
3386
3387 EXTEND (SP, 2);
3388 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3389 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3390
3391 if (expect_false (current == self))
3392 coro_times_sub (SvSTATE (coro_current));
3393}
3394
3395void
3396swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3397 CODE:
3398{
3399 struct coro *current = SvSTATE_current;
3400
3401 if (current == coro)
3402 SWAP_SVS (current);
3403
3404 if (!coro->swap_sv)
3405 coro->swap_sv = newAV ();
3406
3407 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3409
3410 if (current == coro)
3411 SWAP_SVS (current);
3412}
3413
3084 3414
3085MODULE = Coro::State PACKAGE = Coro 3415MODULE = Coro::State PACKAGE = Coro
3086 3416
3087BOOT: 3417BOOT:
3088{ 3418{
3089 int i;
3090
3091 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3419 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3092 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3420 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3093 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3421 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3094 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3422 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3095 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3423 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); 3424 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3097 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3425 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3098 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3426 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3427 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3099 3428
3100 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3429 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); 3430 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); 3431 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); 3432 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3104 3433
3105 coro_stash = gv_stashpv ("Coro", TRUE); 3434 coro_stash = gv_stashpv ("Coro", TRUE);
3106 3435
3107 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3436 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3108 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3437 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3109 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3438 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3110 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3439 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3111 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3440 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3112 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3441 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 3442
3117 { 3443 {
3118 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3444 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3119 3445
3120 coroapi.schedule = api_schedule; 3446 coroapi.schedule = api_schedule;
… …
3130 sv_setiv (sv, (IV)&coroapi); 3456 sv_setiv (sv, (IV)&coroapi);
3131 SvREADONLY_on (sv); 3457 SvREADONLY_on (sv);
3132 } 3458 }
3133} 3459}
3134 3460
3461SV *
3462async (...)
3463 PROTOTYPE: &@
3464 CODE:
3465 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3466 api_ready (aTHX_ RETVAL);
3467 OUTPUT:
3468 RETVAL
3469
3135void 3470void
3136terminate (...) 3471terminate (...)
3137 CODE: 3472 CODE:
3138 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3473 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3139 3474
… …
3159 3494
3160void 3495void
3161cede_notself (...) 3496cede_notself (...)
3162 CODE: 3497 CODE:
3163 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3498 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3164
3165void
3166_cancel (Coro::State self)
3167 CODE:
3168 coro_state_destroy (aTHX_ self);
3169 coro_call_on_destroy (aTHX_ self);
3170 3499
3171void 3500void
3172_set_current (SV *current) 3501_set_current (SV *current)
3173 PROTOTYPE: $ 3502 PROTOTYPE: $
3174 CODE: 3503 CODE:
… …
3178void 3507void
3179_set_readyhook (SV *hook) 3508_set_readyhook (SV *hook)
3180 PROTOTYPE: $ 3509 PROTOTYPE: $
3181 CODE: 3510 CODE:
3182 SvREFCNT_dec (coro_readyhook); 3511 SvREFCNT_dec (coro_readyhook);
3512 SvGETMAGIC (hook);
3513 if (SvOK (hook))
3514 {
3183 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3515 coro_readyhook = newSVsv (hook);
3516 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3517 }
3518 else
3519 {
3520 coro_readyhook = 0;
3521 CORO_READYHOOK = 0;
3522 }
3184 3523
3185int 3524int
3186prio (Coro::State coro, int newprio = 0) 3525prio (Coro::State coro, int newprio = 0)
3187 PROTOTYPE: $;$ 3526 PROTOTYPE: $;$
3188 ALIAS: 3527 ALIAS:
… …
3194 if (items > 1) 3533 if (items > 1)
3195 { 3534 {
3196 if (ix) 3535 if (ix)
3197 newprio = coro->prio - newprio; 3536 newprio = coro->prio - newprio;
3198 3537
3199 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3538 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3200 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3539 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3201 3540
3202 coro->prio = newprio; 3541 coro->prio = newprio;
3203 } 3542 }
3204} 3543}
3205 OUTPUT: 3544 OUTPUT:
… …
3220 RETVAL = coro_nready; 3559 RETVAL = coro_nready;
3221 OUTPUT: 3560 OUTPUT:
3222 RETVAL 3561 RETVAL
3223 3562
3224void 3563void
3564suspend (Coro::State self)
3565 PROTOTYPE: $
3566 CODE:
3567 self->flags |= CF_SUSPENDED;
3568
3569void
3570resume (Coro::State self)
3571 PROTOTYPE: $
3572 CODE:
3573 self->flags &= ~CF_SUSPENDED;
3574
3575void
3225_pool_handler (...) 3576_pool_handler (...)
3226 CODE: 3577 CODE:
3227 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3578 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3228 3579
3229void 3580void
… …
3240 for (i = 1; i < items; ++i) 3591 for (i = 1; i < items; ++i)
3241 av_push (av, SvREFCNT_inc_NN (ST (i))); 3592 av_push (av, SvREFCNT_inc_NN (ST (i)));
3242 3593
3243 if ((SV *)hv == &PL_sv_undef) 3594 if ((SV *)hv == &PL_sv_undef)
3244 { 3595 {
3245 PUSHMARK (SP); 3596 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3246 EXTEND (SP, 2);
3247 PUSHs (sv_Coro);
3248 PUSHs ((SV *)cv_pool_handler);
3249 PUTBACK;
3250 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3251 SPAGAIN;
3252
3253 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3597 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3598 SvREFCNT_dec (sv);
3254 } 3599 }
3255 3600
3256 { 3601 {
3257 struct coro *coro = SvSTATE_hv (hv); 3602 struct coro *coro = SvSTATE_hv (hv);
3258 3603
… …
3282rouse_wait (...) 3627rouse_wait (...)
3283 PROTOTYPE: ;$ 3628 PROTOTYPE: ;$
3284 PPCODE: 3629 PPCODE:
3285 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3630 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3286 3631
3632void
3633on_enter (SV *block)
3634 ALIAS:
3635 on_leave = 1
3636 PROTOTYPE: &
3637 CODE:
3638{
3639 struct coro *coro = SvSTATE_current;
3640 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3641
3642 block = s_get_cv_croak (block);
3643
3644 if (!*avp)
3645 *avp = newAV ();
3646
3647 av_push (*avp, SvREFCNT_inc (block));
3648
3649 if (!ix)
3650 on_enterleave_call (aTHX_ block);
3651
3652 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3653 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3654 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3655}
3656
3287 3657
3288MODULE = Coro::State PACKAGE = PerlIO::cede 3658MODULE = Coro::State PACKAGE = PerlIO::cede
3289 3659
3290BOOT: 3660BOOT:
3291 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3661 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3294MODULE = Coro::State PACKAGE = Coro::Semaphore 3664MODULE = Coro::State PACKAGE = Coro::Semaphore
3295 3665
3296SV * 3666SV *
3297new (SV *klass, SV *count = 0) 3667new (SV *klass, SV *count = 0)
3298 CODE: 3668 CODE:
3669{
3670 int semcnt = 1;
3671
3672 if (count)
3673 {
3674 SvGETMAGIC (count);
3675
3676 if (SvOK (count))
3677 semcnt = SvIV (count);
3678 }
3679
3299 RETVAL = sv_bless ( 3680 RETVAL = sv_bless (
3300 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3681 coro_waitarray_new (aTHX_ semcnt),
3301 GvSTASH (CvGV (cv)) 3682 GvSTASH (CvGV (cv))
3302 ); 3683 );
3684}
3303 OUTPUT: 3685 OUTPUT:
3304 RETVAL 3686 RETVAL
3305 3687
3306# helper for Coro::Channel 3688# helper for Coro::Channel and others
3307SV * 3689SV *
3308_alloc (int count) 3690_alloc (int count)
3309 CODE: 3691 CODE:
3310 RETVAL = coro_waitarray_new (aTHX_ count); 3692 RETVAL = coro_waitarray_new (aTHX_ count);
3311 OUTPUT: 3693 OUTPUT:
… …
3369 for (i = 1; i <= wcount; ++i) 3751 for (i = 1; i <= wcount; ++i)
3370 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3752 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3371 } 3753 }
3372} 3754}
3373 3755
3756MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3757
3758void
3759_may_delete (SV *sem, int count, int extra_refs)
3760 PPCODE:
3761{
3762 AV *av = (AV *)SvRV (sem);
3763
3764 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3765 && AvFILLp (av) == 0 /* no waiters, just count */
3766 && SvIV (AvARRAY (av)[0]) == count)
3767 XSRETURN_YES;
3768
3769 XSRETURN_NO;
3770}
3771
3374MODULE = Coro::State PACKAGE = Coro::Signal 3772MODULE = Coro::State PACKAGE = Coro::Signal
3375 3773
3376SV * 3774SV *
3377new (SV *klass) 3775new (SV *klass)
3378 CODE: 3776 CODE:
… …
3449 3847
3450void 3848void
3451_register (char *target, char *proto, SV *req) 3849_register (char *target, char *proto, SV *req)
3452 CODE: 3850 CODE:
3453{ 3851{
3454 CV *req_cv = coro_sv_2cv (aTHX_ req); 3852 SV *req_cv = s_get_cv_croak (req);
3455 /* newXSproto doesn't return the CV on 5.8 */ 3853 /* newXSproto doesn't return the CV on 5.8 */
3456 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3854 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3457 sv_setpv ((SV *)slf_cv, proto); 3855 sv_setpv ((SV *)slf_cv, proto);
3458 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3856 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3459} 3857}
3460 3858
3859MODULE = Coro::State PACKAGE = Coro::Select
3860
3861void
3862patch_pp_sselect ()
3863 CODE:
3864 if (!coro_old_pp_sselect)
3865 {
3866 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3867 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3868 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3869 }
3870
3871void
3872unpatch_pp_sselect ()
3873 CODE:
3874 if (coro_old_pp_sselect)
3875 {
3876 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3877 coro_old_pp_sselect = 0;
3878 }
3879

Diff Legend

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