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.316 by root, Thu Nov 20 06:01:40 2008 UTC vs.
Revision 1.381 by root, Sat Oct 23 09:28:50 2010 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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
114#endif 67#endif
115 68
116#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
130#else 83#else
131# define dSTACKLEVEL volatile void *stacklevel 84# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 85# define STACKLEVEL ((void *)&stacklevel)
133#endif 86#endif
134 87
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 88#define IN_DESTRUCT PL_dirty
136 89
137#if __GNUC__ >= 3 90#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 93# define INLINE static inline
141#else 94#else
142# define attribute(x) 95# define attribute(x)
143# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
144# define INLINE static 97# define INLINE static
… …
156# if CORO_PTHREAD 109# if CORO_PTHREAD
157static void *coro_thx; 110static void *coro_thx;
158# endif 111# endif
159#endif 112#endif
160 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
161static 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]);
162 126
163/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
166 130
… …
170static AV *main_mainstack; /* used to differentiate between $main and others */ 134static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 135static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 136static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 137static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 138
139static AV *av_destroy; /* destruction queue */
140static SV *sv_manager; /* the manager coro */
141static SV *sv_idle; /* $Coro::idle */
142
175static GV *irsgv; /* $/ */ 143static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 144static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 145static SV *rv_diehook;
178static SV *rv_warnhook; 146static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 147static HV *hv_sig; /* %SIG */
180 148
181/* async_pool helper stuff */ 149/* async_pool helper stuff */
182static SV *sv_pool_rss; 150static SV *sv_pool_rss;
183static SV *sv_pool_size; 151static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 152static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 153static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 154static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 155static CV *cv_pool_handler;
188static CV *cv_coro_state_new;
189 156
190/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
191static 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;
192 165
193static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
195 168
196enum { 169enum {
… …
222 int valgrind_id; 195 int valgrind_id;
223#endif 196#endif
224 unsigned char flags; 197 unsigned char flags;
225} coro_cctx; 198} coro_cctx;
226 199
200coro_cctx *cctx_current; /* the currently running cctx */
201
202/*****************************************************************************/
203
227enum { 204enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
231 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 */
232}; 210};
233 211
234/* 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 */
235typedef struct 213typedef struct
236{ 214{
237 SV *defsv; 215 SV *defsv;
238 AV *defav; 216 AV *defav;
239 SV *errsv; 217 SV *errsv;
240 SV *irsgv; 218 SV *irsgv;
219 HV *hinthv;
241#define VAR(name,type) type name; 220#define VAR(name,type) type name;
242# include "state.h" 221# include "state.h"
243#undef VAR 222#undef VAR
244} perl_slots; 223} perl_slots;
245 224
… …
247 226
248/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
249struct coro { 228struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 230 coro_cctx *cctx;
231
232 /* ready queue */
233 struct coro *next_ready;
252 234
253 /* state data */ 235 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 237 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
… …
273 /* async_pool */ 255 /* async_pool */
274 SV *saved_deffh; 256 SV *saved_deffh;
275 SV *invoke_cb; 257 SV *invoke_cb;
276 AV *invoke_av; 258 AV *invoke_av;
277 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
278 /* linked list */ 270 /* linked list */
279 struct coro *next, *prev; 271 struct coro *next, *prev;
280}; 272};
281 273
282typedef struct coro *Coro__State; 274typedef struct coro *Coro__State;
… …
287/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
289 281
290/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
291 283
292#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
298 290
299/* for Coro.pm */ 291/* for Coro.pm */
300static SV *coro_current; 292static SV *coro_current;
301static SV *coro_readyhook; 293static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 295static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 296static struct coro *coro_first;
305#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}
306 318
307/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
308 320
309static SV * 321static SV *
310coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
334 get_hv (name, create); 346 get_hv (name, create);
335#endif 347#endif
336 return get_hv (name, create); 348 return get_hv (name, create);
337} 349}
338 350
339/* may croak */ 351INLINE void
340INLINE CV * 352coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 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{
343 HV *st; 420 HV *stash;
344 GV *gvp; 421 MAGIC *mg;
345 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;
346} 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 */
347 449
348static AV * 450static AV *
349coro_clone_padlist (pTHX_ CV *cv) 451coro_derive_padlist (pTHX_ CV *cv)
350{ 452{
351 AV *padlist = CvPADLIST (cv); 453 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 454 AV *newpadlist, *newpad;
353 455
354 newpadlist = newAV (); 456 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 462#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 464 --AvFILLp (padlist);
363 465
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 467 av_store (newpadlist, 1, (SV *)newpad);
366 468
367 return newpadlist; 469 return newpadlist;
368} 470}
369 471
370static void 472static void
371free_padlist (pTHX_ AV *padlist) 473free_padlist (pTHX_ AV *padlist)
372{ 474{
373 /* may be during global destruction */ 475 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 476 if (!IN_DESTRUCT)
375 { 477 {
376 I32 i = AvFILLp (padlist); 478 I32 i = AvFILLp (padlist);
377 while (i >= 0) 479
480 while (i > 0) /* special-case index 0 */
378 { 481 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 482 /* we try to be extra-careful here */
380 if (svp) 483 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 484 I32 j = AvFILLp (av);
382 SV *sv; 485
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 486 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]);
488
489 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 490 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 491 }
389 492
493 SvREFCNT_dec (AvARRAY (padlist)[0]);
494
495 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 496 SvREFCNT_dec ((SV*)padlist);
391 } 497 }
392} 498}
393 499
394static int 500static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 502{
397 AV *padlist; 503 AV *padlist;
398 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;
399 509
400 /* casting is fun. */ 510 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
403 513
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 515
406 return 0; 516 return 0;
407} 517}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 518
412static MGVTBL coro_cv_vtbl = { 519static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 520 0, 0, 0, 0,
414 coro_cv_free 521 coro_cv_free
415}; 522};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 523
460/* the next two functions merely cache the padlists */ 524/* the next two functions merely cache the padlists */
461static void 525static void
462get_padlist (pTHX_ CV *cv) 526get_padlist (pTHX_ CV *cv)
463{ 527{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 538 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 539 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 540 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 541 SvREFCNT_dec (cp);
478#else 542#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 544#endif
481 } 545 }
482} 546}
483 547
484static void 548static void
… …
491 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);
492 556
493 av = (AV *)mg->mg_obj; 557 av = (AV *)mg->mg_obj;
494 558
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 560 av_extend (av, AvFILLp (av) + 1);
497 561
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 563}
500 564
501/** 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);
502 620
503static void 621static void
504load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
505{ 623{
506 perl_slots *slot = c->slot; 624 perl_slots *slot = c->slot;
507 c->slot = 0; 625 c->slot = 0;
508 626
509 PL_mainstack = c->mainstack; 627 PL_mainstack = c->mainstack;
510 628
511 GvSV (PL_defgv) = slot->defsv; 629 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 630 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 631 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
515 634
516 #define VAR(name,type) PL_ ## name = slot->name; 635 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 636 # include "state.h"
518 #undef VAR 637 #undef VAR
519 638
… …
533 PUTBACK; 652 PUTBACK;
534 } 653 }
535 654
536 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
537 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);
538} 675}
539 676
540static void 677static void
541save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
542{ 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
543 c->except = CORO_THROW; 698 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
545 700
546 { 701 {
547 dSP; 702 dSP;
… …
560 { 715 {
561 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
562 { 717 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
564 719
565 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))
566 { 721 {
567 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
568 723
569 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
570 { 725 {
… …
594 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
595 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
598 { 753 {
599 int i; 754 unsigned int i;
600 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
601 CXINC; 756 CXINC;
602 } 757 }
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
604 759
605 c->mainstack = PL_mainstack; 760 c->mainstack = PL_mainstack;
606 761
607 { 762 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 764
610 slot->defav = GvAV (PL_defgv); 765 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 766 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 767 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
614 770
615 #define VAR(name,type) slot->name = PL_ ## name; 771 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 772 # include "state.h"
617 #undef VAR 773 #undef VAR
618 } 774 }
… …
745#endif 901#endif
746 902
747/* 903/*
748 * This overrides the default magic get method of %SIG elements. 904 * This overrides the default magic get method of %SIG elements.
749 * 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
750 * 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
751 * readback here. 907 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 908 */
756static int 909static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 911{
759 const char *s = MgPV_nolen_const (mg); 912 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 966
814 if (svp) 967 if (svp)
815 { 968 {
816 SV *old = *svp; 969 SV *old = *svp;
817 *svp = newSVsv (sv); 970 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 971 SvREFCNT_dec (old);
819 return 0; 972 return 0;
820 } 973 }
821 } 974 }
822 975
… …
834slf_check_nop (pTHX_ struct CoroSLF *frame) 987slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 988{
836 return 0; 989 return 0;
837} 990}
838 991
839static UNOP coro_setup_op; 992static int
993slf_check_repeat (pTHX_ struct CoroSLF *frame)
994{
995 return 1;
996}
997
998static UNOP init_perl_op;
840 999
841static 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 */
842coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
843{ 1002{
844 /* 1003 /*
845 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
846 */ 1005 */
847 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
848 1007
849 PL_runops = RUNOPS_DEFAULT; 1008 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 1009 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 1010 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 1011 PL_comppad = 0;
1012 PL_comppad_name = 0;
1013 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 1015 PL_curpm = 0;
854 PL_curpad = 0; 1016 PL_curpad = 0;
855 PL_localizing = 0; 1017 PL_localizing = 0;
856 PL_dirty = 0; 1018 PL_dirty = 0;
857 PL_restartop = 0; 1019 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 1020#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 1021 PL_parser = 0;
860#endif 1022#endif
1023 PL_hints = 0;
861 1024
862 /* recreate the die/warn hooks */ 1025 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 1028
866 GvSV (PL_defgv) = newSV (0); 1029 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 1030 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 1031 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 1034 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1035 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 1036
873 { 1037 {
874 dSP; 1038 dSP;
… …
891 */ 1055 */
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 1058
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 1060 init_perl_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 1061 init_perl_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 1062 init_perl_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 1063 /* no flags etc. required, as an init function won't be called */
900 1064
901 PL_op = (OP *)&coro_setup_op; 1065 PL_op = (OP *)&init_perl_op;
902 1066
903 /* copy throw, in case it was set before coro_setup */ 1067 /* copy throw, in case it was set before init_perl */
904 CORO_THROW = coro->except; 1068 CORO_THROW = coro->except;
905}
906 1069
1070 SWAP_SVS (coro);
1071
1072 if (expect_false (enable_times))
1073 {
1074 coro_times_update ();
1075 coro_times_sub (coro);
1076 }
1077}
1078
907static void 1079static void
908coro_destruct (pTHX_ struct coro *coro) 1080coro_unwind_stacks (pTHX)
909{ 1081{
910 if (!IN_DESTRUCT) 1082 if (!IN_DESTRUCT)
911 { 1083 {
912 /* restore all saved variables and stuff */ 1084 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 1085 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1093 POPSTACK_TO (PL_mainstack);
922 1094
923 /* unwind main stack */ 1095 /* unwind main stack */
924 dounwind (-1); 1096 dounwind (-1);
925 } 1097 }
1098}
926 1099
927 SvREFCNT_dec (GvSV (PL_defgv)); 1100static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1101destroy_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1102{
930 SvREFCNT_dec (PL_defoutgv); 1103 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1104
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1105 {
1106 struct coro *current = SvSTATE_current;
1107
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109
1110 save_perl (aTHX_ current);
1111 load_perl (aTHX_ coro);
1112
1113 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1118
1119 // now save some sv's to be free'd later
1120 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs;
1125 svf [5] = GvSV (irsgv);
1126 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf));
1130
1131 load_perl (aTHX_ current);
1132 }
1133
1134 {
1135 unsigned int i;
1136
1137 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1138 SvREFCNT_dec (svf [i]);
1139
937 SvREFCNT_dec (coro->saved_deffh); 1140 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1141 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1142 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1143 SvREFCNT_dec (coro->invoke_av);
941 1144 }
942 coro_destruct_stacks (aTHX);
943} 1145}
944 1146
945INLINE void 1147INLINE void
946free_coro_mortal (pTHX) 1148free_coro_mortal (pTHX)
947{ 1149{
… …
955static int 1157static int
956runops_trace (pTHX) 1158runops_trace (pTHX)
957{ 1159{
958 COP *oldcop = 0; 1160 COP *oldcop = 0;
959 int oldcxix = -2; 1161 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1162
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1163 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1164 {
965 PERL_ASYNC_CHECK (); 1165 PERL_ASYNC_CHECK ();
966 1166
967 if (cctx->flags & CC_TRACE_ALL) 1167 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1168 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1169 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1170 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1171 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1172 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1173 AV *av = newAV (); /* return values */
974 SV **cb; 1174 SV **cb;
… …
1011 1211
1012 if (PL_curcop != &PL_compiling) 1212 if (PL_curcop != &PL_compiling)
1013 { 1213 {
1014 SV **cb; 1214 SV **cb;
1015 1215
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1216 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1217 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1218 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1219
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1220 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1221 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1222 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1223 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1224 SV *fullname = sv_2mortal (newSV (0));
1026 1225
1027 if (isGV (gv)) 1226 if (isGV (gv))
… …
1045 } 1244 }
1046 1245
1047 oldcxix = cxstack_ix; 1246 oldcxix = cxstack_ix;
1048 } 1247 }
1049 1248
1050 if (cctx->flags & CC_TRACE_LINE) 1249 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1250 {
1052 dSP; 1251 dSP;
1053 1252
1054 PL_runops = RUNOPS_DEFAULT; 1253 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1254 ENTER;
… …
1074 1273
1075 TAINT_NOT; 1274 TAINT_NOT;
1076 return 0; 1275 return 0;
1077} 1276}
1078 1277
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1278static struct CoroSLF cctx_ssl_frame;
1081 1279
1082static void 1280static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1281slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1282{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1283 ta->prev = 0;
1087} 1284}
1088 1285
1089static int 1286static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1287slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1288{
… …
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1292}
1096 1293
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1295static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1296cctx_prepare (pTHX)
1100{ 1297{
1101 PL_top_env = &PL_start_env; 1298 PL_top_env = &PL_start_env;
1102 1299
1103 if (cctx->flags & CC_TRACE) 1300 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1301 PL_runops = runops_trace;
1105 1302
1106 /* we already must be executing an SLF op, there is no other valid way 1303 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1304 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1305 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1306 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1307
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1308 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1309 cctx_ssl_frame = slf_frame;
1114 1310
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1311 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1312 slf_frame.check = slf_check_set_stacklevel;
1117} 1313}
… …
1140 /* normally we would need to skip the entersub here */ 1336 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1337 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1338 /* PL_nop = PL_nop->op_next */
1143 1339
1144 /* inject a fake subroutine call to cctx_init */ 1340 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1341 cctx_prepare (aTHX);
1146 1342
1147 /* cctx_run is the alternative tail of transfer() */ 1343 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1344 transfer_tail (aTHX);
1149 1345
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1346 /* somebody or something will hit me for both perl_run and PL_restartop */
1151 PL_restartop = PL_op; 1347 PL_restartop = PL_op;
1152 perl_run (PL_curinterp); 1348 perl_run (PL_curinterp);
1153 /* 1349 /*
1154 * Unfortunately, there is no way to get at the return values of the 1350 * Unfortunately, there is no way to get at the return values of the
1155 * coro body here, as perl_run destroys these 1351 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1352 * runtime errors here, as this is just a random interpreter, not a thread.
1156 */ 1353 */
1157 1354
1158 /* 1355 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1356 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1357 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1358 * reason for perl_run to return. We try to exit by jumping to the
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1359 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1363 */
1165 PL_top_env = main_top_env; 1364 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1366 }
1168} 1367}
… …
1245cctx_destroy (coro_cctx *cctx) 1444cctx_destroy (coro_cctx *cctx)
1246{ 1445{
1247 if (!cctx) 1446 if (!cctx)
1248 return; 1447 return;
1249 1448
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1450
1250 --cctx_count; 1451 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1452 coro_destroy (&cctx->cctx);
1252 1453
1253 /* coro_transfer creates new, empty cctx's */ 1454 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1455 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1518 /* TODO: throwing up here is considered harmful */
1318 1519
1319 if (expect_true (prev != next)) 1520 if (expect_true (prev != next))
1320 { 1521 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1524
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1527
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1528#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1529 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1531#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1538{
1341 dSTACKLEVEL; 1539 dSTACKLEVEL;
1342 1540
1343 /* sometimes transfer is only called to set idle_sp */ 1541 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1542 if (expect_false (!prev))
1345 { 1543 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1544 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1546 }
1349 else if (expect_true (prev != next)) 1547 else if (expect_true (prev != next))
1350 { 1548 {
1351 coro_cctx *prev__cctx; 1549 coro_cctx *cctx_prev;
1352 1550
1353 if (expect_false (prev->flags & CF_NEW)) 1551 if (expect_false (prev->flags & CF_NEW))
1354 { 1552 {
1355 /* create a new empty/source context */ 1553 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1554 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1555 prev->flags |= CF_RUNNING;
1359 } 1556 }
1360 1557
1361 prev->flags &= ~CF_RUNNING; 1558 prev->flags &= ~CF_RUNNING;
… …
1367 if (expect_false (next->flags & CF_NEW)) 1564 if (expect_false (next->flags & CF_NEW))
1368 { 1565 {
1369 /* need to start coroutine */ 1566 /* need to start coroutine */
1370 next->flags &= ~CF_NEW; 1567 next->flags &= ~CF_NEW;
1371 /* setup coroutine call */ 1568 /* setup coroutine call */
1372 coro_setup (aTHX_ next); 1569 init_perl (aTHX_ next);
1373 } 1570 }
1374 else 1571 else
1375 load_perl (aTHX_ next); 1572 load_perl (aTHX_ next);
1376 1573
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1574 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1575 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1576 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1577 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1578 && !force_cctx
1384 )) 1579 ))
1385 { 1580 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1583
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1585 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1586 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1587 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1588 next->cctx = cctx_get (aTHX);
1396 1589
1397 cctx_put (prev__cctx); 1590 cctx_put (cctx_current);
1398 } 1591 }
1592 else
1593 prev->cctx = cctx_current;
1399 1594
1400 ++next->usecount; 1595 ++next->usecount;
1401 1596
1402 if (expect_true (!next->cctx)) 1597 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1599
1405 if (expect_false (prev__cctx != next->cctx)) 1600 next->cctx = 0;
1601
1602 if (expect_false (cctx_prev != cctx_current))
1406 { 1603 {
1407 prev__cctx->top_env = PL_top_env; 1604 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1605 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1607 }
1411 1608
1412 transfer_tail (aTHX); 1609 transfer_tail (aTHX);
1413 } 1610 }
1414} 1611}
… …
1422coro_state_destroy (pTHX_ struct coro *coro) 1619coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1620{
1424 if (coro->flags & CF_DESTROYED) 1621 if (coro->flags & CF_DESTROYED)
1425 return 0; 1622 return 0;
1426 1623
1427 if (coro->on_destroy) 1624 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1625 coro->on_destroy (aTHX_ coro);
1429 1626
1430 coro->flags |= CF_DESTROYED; 1627 coro->flags |= CF_DESTROYED;
1431 1628
1432 if (coro->flags & CF_READY) 1629 if (coro->flags & CF_READY)
… …
1436 --coro_nready; 1633 --coro_nready;
1437 } 1634 }
1438 else 1635 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1637
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1638 if (coro->mainstack
1442 { 1639 && coro->mainstack != main_mainstack
1443 struct coro temp; 1640 && coro->slot
1444 1641 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro); 1642 destroy_perl (aTHX_ coro);
1449 1643
1450 coro_destruct (aTHX_ coro); 1644 if (coro->next) coro->next->prev = coro->prev;
1451 1645 if (coro->prev) coro->prev->next = coro->next;
1452 load_perl (aTHX_ &temp); 1646 if (coro == coro_first) coro_first = coro->next;
1453
1454 coro->slot = 0;
1455 }
1456 1647
1457 cctx_destroy (coro->cctx); 1648 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1649 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1650 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv);
1460 SvREFCNT_dec (CORO_THROW); 1652 SvREFCNT_dec (CORO_THROW);
1461
1462 if (coro->next) coro->next->prev = coro->prev;
1463 if (coro->prev) coro->prev->next = coro->next;
1464 if (coro == coro_first) coro_first = coro->next;
1465 1653
1466 return 1; 1654 return 1;
1467} 1655}
1468 1656
1469static int 1657static int
… …
1519 1707
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1708 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1709 TRANSFER (ta, 1);
1522} 1710}
1523 1711
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1712/** Coro ********************************************************************/
1548 1713
1549INLINE void 1714INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1715coro_enq (pTHX_ struct coro *coro)
1551{ 1716{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1718
1555INLINE SV * 1719 SvREFCNT_inc_NN (coro->hv);
1720
1721 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro;
1724}
1725
1726INLINE struct coro *
1556coro_deq (pTHX) 1727coro_deq (pTHX)
1557{ 1728{
1558 int prio; 1729 int prio;
1559 1730
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1732 {
1562 return av_shift (coro_ready [prio]); 1733 struct coro **ready = coro_ready [prio];
1734
1735 if (ready [0])
1736 {
1737 struct coro *coro = ready [0];
1738 ready [0] = coro->next_ready;
1739 return coro;
1740 }
1741 }
1563 1742
1564 return 0; 1743 return 0;
1744}
1745
1746static void
1747invoke_sv_ready_hook_helper (void)
1748{
1749 dTHX;
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1565} 1761}
1566 1762
1567static int 1763static int
1568api_ready (pTHX_ SV *coro_sv) 1764api_ready (pTHX_ SV *coro_sv)
1569{ 1765{
1570 struct coro *coro;
1571 SV *sv_hook;
1572 void (*xs_hook)(void);
1573
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1766 struct coro *coro = SvSTATE (coro_sv);
1578 1767
1579 if (coro->flags & CF_READY) 1768 if (coro->flags & CF_READY)
1580 return 0; 1769 return 0;
1581 1770
1582 coro->flags |= CF_READY; 1771 coro->flags |= CF_READY;
1583 1772
1584 sv_hook = coro_nready ? 0 : coro_readyhook;
1585 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1586
1587 coro_enq (aTHX_ coro); 1773 coro_enq (aTHX_ coro);
1588 ++coro_nready;
1589 1774
1590 if (sv_hook) 1775 if (!coro_nready++)
1591 { 1776 if (coroapi.readyhook)
1592 dSP; 1777 coroapi.readyhook ();
1593
1594 ENTER;
1595 SAVETMPS;
1596
1597 PUSHMARK (SP);
1598 PUTBACK;
1599 call_sv (sv_hook, G_VOID | G_DISCARD);
1600
1601 FREETMPS;
1602 LEAVE;
1603 }
1604
1605 if (xs_hook)
1606 xs_hook ();
1607 1778
1608 return 1; 1779 return 1;
1609} 1780}
1610 1781
1611static int 1782static int
… …
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1785 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1786}
1616 1787
1617/* expects to own a reference to next->hv */ 1788/* expects to own a reference to next->hv */
1618INLINE void 1789INLINE void
1619prepare_cede_to (pTHX_ struct coro_transfer_args *ta, struct coro *next) 1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1620{ 1791{
1621 SV *prev_sv = SvRV (coro_current); 1792 SV *prev_sv = SvRV (coro_current);
1622 1793
1623 ta->prev = SvSTATE_hv (prev_sv); 1794 ta->prev = SvSTATE_hv (prev_sv);
1624 ta->next = next; 1795 ta->next = next;
1625 1796
1626 TRANSFER_CHECK (*ta); 1797 TRANSFER_CHECK (*ta);
1627 1798
1628 SvRV_set (coro_current, next->hv); 1799 SvRV_set (coro_current, (SV *)next->hv);
1629 1800
1630 free_coro_mortal (aTHX); 1801 free_coro_mortal (aTHX);
1631 coro_mortal = prev_sv; 1802 coro_mortal = prev_sv;
1632} 1803}
1633 1804
1634static void 1805static void
1635prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1806prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1636{ 1807{
1637 for (;;) 1808 for (;;)
1638 { 1809 {
1639 SV *next_sv = coro_deq (aTHX); 1810 struct coro *next = coro_deq (aTHX);
1640 1811
1641 if (expect_false (!next_sv)) 1812 if (expect_true (next))
1642 { 1813 {
1643 /* nothing to schedule: call the idle handler */
1644 dSP;
1645
1646 ENTER;
1647 SAVETMPS;
1648
1649 PUSHMARK (SP);
1650 PUTBACK;
1651 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1652
1653 FREETMPS;
1654 LEAVE;
1655 }
1656 else
1657 {
1658 struct coro *next = SvSTATE_hv (next_sv);
1659
1660 /* cannot transfer to destroyed coros, skip and look for next */ 1814 /* cannot transfer to destroyed coros, skip and look for next */
1661 if (expect_false (next->flags & CF_DESTROYED)) 1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1662 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1663 else 1817 else
1664 { 1818 {
1665 next->flags &= ~CF_READY; 1819 next->flags &= ~CF_READY;
1666 --coro_nready; 1820 --coro_nready;
1667 1821
1668 return prepare_cede_to (aTHX_ ta, next); 1822 prepare_schedule_to (aTHX_ ta, next);
1823 break;
1669 } 1824 }
1670 } 1825 }
1826 else
1827 {
1828 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle)))
1831 {
1832 if (SvRV (sv_idle) == SvRV (coro_current))
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1834
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready;
1838 }
1839 else
1840 {
1841 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1842 dSP;
1843
1844 ENTER;
1845 SAVETMPS;
1846
1847 PUSHMARK (SP);
1848 PUTBACK;
1849 call_sv (sv_idle, G_VOID | G_DISCARD);
1850
1851 FREETMPS;
1852 LEAVE;
1853 }
1854 }
1671 } 1855 }
1672} 1856}
1673 1857
1674INLINE void 1858INLINE void
1675prepare_cede (pTHX_ struct coro_transfer_args *ta) 1859prepare_cede (pTHX_ struct coro_transfer_args *ta)
… …
1697{ 1881{
1698 struct coro_transfer_args ta; 1882 struct coro_transfer_args ta;
1699 1883
1700 prepare_schedule (aTHX_ &ta); 1884 prepare_schedule (aTHX_ &ta);
1701 TRANSFER (ta, 1); 1885 TRANSFER (ta, 1);
1886}
1887
1888static void
1889api_schedule_to (pTHX_ SV *coro_sv)
1890{
1891 struct coro_transfer_args ta;
1892 struct coro *next = SvSTATE (coro_sv);
1893
1894 SvREFCNT_inc_NN (coro_sv);
1895 prepare_schedule_to (aTHX_ &ta, next);
1702} 1896}
1703 1897
1704static int 1898static int
1705api_cede (pTHX) 1899api_cede (pTHX)
1706{ 1900{
… …
1735static void 1929static void
1736api_trace (pTHX_ SV *coro_sv, int flags) 1930api_trace (pTHX_ SV *coro_sv, int flags)
1737{ 1931{
1738 struct coro *coro = SvSTATE (coro_sv); 1932 struct coro *coro = SvSTATE (coro_sv);
1739 1933
1934 if (coro->flags & CF_RUNNING)
1935 croak ("cannot enable tracing on a running coroutine, caught");
1936
1740 if (flags & CC_TRACE) 1937 if (flags & CC_TRACE)
1741 { 1938 {
1742 if (!coro->cctx) 1939 if (!coro->cctx)
1743 coro->cctx = cctx_new_run (); 1940 coro->cctx = cctx_new_run ();
1744 else if (!(coro->cctx->flags & CC_TRACE)) 1941 else if (!(coro->cctx->flags & CC_TRACE))
1745 croak ("cannot enable tracing on coroutine with custom stack,"); 1942 croak ("cannot enable tracing on coroutine with custom stack, caught");
1746 1943
1747 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1944 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1748 } 1945 }
1749 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1946 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1750 { 1947 {
… …
1753 if (coro->flags & CF_RUNNING) 1950 if (coro->flags & CF_RUNNING)
1754 PL_runops = RUNOPS_DEFAULT; 1951 PL_runops = RUNOPS_DEFAULT;
1755 else 1952 else
1756 coro->slot->runops = RUNOPS_DEFAULT; 1953 coro->slot->runops = RUNOPS_DEFAULT;
1757 } 1954 }
1955}
1956
1957static void
1958coro_call_on_destroy (pTHX_ struct coro *coro)
1959{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962
1963 if (on_destroyp)
1964 {
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966
1967 while (AvFILLp (on_destroy) >= 0)
1968 {
1969 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP);
1973
1974 if (statusp)
1975 {
1976 int i;
1977 AV *status = (AV *)SvRV (*statusp);
1978 EXTEND (SP, AvFILLp (status) + 1);
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 }
1983
1984 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1986 }
1987 }
1988}
1989
1990static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1992{
1993 int i;
1994 HV *hv = (HV *)SvRV (coro_current);
1995 AV *av = newAV ();
1996
1997 /* items are actually not so common, so optimise for this case */
1998 if (items)
1999 {
2000 av_extend (av, items - 1);
2001
2002 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 }
2005
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2007
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager);
2010
2011 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat;
2013
2014 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/
1758} 2017}
1759 2018
1760/*****************************************************************************/ 2019/*****************************************************************************/
1761/* async pool handler */ 2020/* async pool handler */
1762 2021
… …
1840 2099
1841static void 2100static void
1842coro_rouse_callback (pTHX_ CV *cv) 2101coro_rouse_callback (pTHX_ CV *cv)
1843{ 2102{
1844 dXSARGS; 2103 dXSARGS;
1845 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
1846 2105
1847 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2106 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1848 { 2107 {
1849 /* first call, set args */ 2108 /* first call, set args */
2109 SV *coro = SvRV (data);
1850 AV *av = newAV (); 2110 AV *av = newAV ();
1851 SV *coro = SvRV (data);
1852 2111
1853 SvRV_set (data, (SV *)av); 2112 SvRV_set (data, (SV *)av);
1854 api_ready (aTHX_ coro);
1855 SvREFCNT_dec (coro);
1856 2113
1857 /* better take a full copy of the arguments */ 2114 /* better take a full copy of the arguments */
1858 while (items--) 2115 while (items--)
1859 av_store (av, items, newSVsv (ST (items))); 2116 av_store (av, items, newSVsv (ST (items)));
2117
2118 api_ready (aTHX_ coro);
2119 SvREFCNT_dec (coro);
1860 } 2120 }
1861 2121
1862 XSRETURN_EMPTY; 2122 XSRETURN_EMPTY;
1863} 2123}
1864 2124
… …
1881 2141
1882 EXTEND (SP, AvFILLp (av) + 1); 2142 EXTEND (SP, AvFILLp (av) + 1);
1883 for (i = 0; i <= AvFILLp (av); ++i) 2143 for (i = 0; i <= AvFILLp (av); ++i)
1884 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2144 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1885 2145
1886 /* we have stolen the elements, so ste length to zero and free */ 2146 /* we have stolen the elements, so set length to zero and free */
1887 AvFILLp (av) = -1; 2147 AvFILLp (av) = -1;
1888 av_undef (av); 2148 av_undef (av);
1889 2149
1890 PUTBACK; 2150 PUTBACK;
1891 } 2151 }
… …
1915 || SvTYPE (SvRV (cb)) != SVt_PVCV 2175 || SvTYPE (SvRV (cb)) != SVt_PVCV
1916 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1917 croak ("Coro::rouse_wait called with illegal callback argument,"); 2177 croak ("Coro::rouse_wait called with illegal callback argument,");
1918 2178
1919 { 2179 {
1920 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1921 SV *data = (SV *)GENSUB_ARG; 2181 SV *data = (SV *)S_GENSUB_ARG;
1922 2182
1923 frame->data = (void *)data; 2183 frame->data = (void *)data;
1924 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2184 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1925 frame->check = slf_check_rouse_wait; 2185 frame->check = slf_check_rouse_wait;
1926 } 2186 }
… …
1930coro_new_rouse_cb (pTHX) 2190coro_new_rouse_cb (pTHX)
1931{ 2191{
1932 HV *hv = (HV *)SvRV (coro_current); 2192 HV *hv = (HV *)SvRV (coro_current);
1933 struct coro *coro = SvSTATE_hv (hv); 2193 struct coro *coro = SvSTATE_hv (hv);
1934 SV *data = newRV_inc ((SV *)hv); 2194 SV *data = newRV_inc ((SV *)hv);
1935 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2195 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1936 2196
1937 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2197 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1938 SvREFCNT_dec (data); /* magicext increases the refcount */ 2198 SvREFCNT_dec (data); /* magicext increases the refcount */
1939 2199
1940 SvREFCNT_dec (coro->rouse_cb); 2200 SvREFCNT_dec (coro->rouse_cb);
… …
1995static void 2255static void
1996slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2256slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1997{ 2257{
1998 frame->prepare = prepare_schedule; 2258 frame->prepare = prepare_schedule;
1999 frame->check = slf_check_nop; 2259 frame->check = slf_check_nop;
2260}
2261
2262static void
2263slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2264{
2265 struct coro *next = (struct coro *)slf_frame.data;
2266
2267 SvREFCNT_inc_NN (next->hv);
2268 prepare_schedule_to (aTHX_ ta, next);
2269}
2270
2271static void
2272slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2273{
2274 if (!items)
2275 croak ("Coro::schedule_to expects a coroutine argument, caught");
2276
2277 frame->data = (void *)SvSTATE (arg [0]);
2278 frame->prepare = slf_prepare_schedule_to;
2279 frame->check = slf_check_nop;
2280}
2281
2282static void
2283slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2284{
2285 api_ready (aTHX_ SvRV (coro_current));
2286
2287 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2000} 2288}
2001 2289
2002static void 2290static void
2003slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2291slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2004{ 2292{
… …
2137 if (PL_op->op_flags & OPf_STACKED) 2425 if (PL_op->op_flags & OPf_STACKED)
2138 { 2426 {
2139 if (items > slf_arga) 2427 if (items > slf_arga)
2140 { 2428 {
2141 slf_arga = items; 2429 slf_arga = items;
2142 free (slf_argv); 2430 Safefree (slf_argv);
2143 slf_argv = malloc (slf_arga * sizeof (SV *)); 2431 New (0, slf_argv, slf_arga, SV *);
2144 } 2432 }
2145 2433
2146 slf_argc = items; 2434 slf_argc = items;
2147 2435
2148 for (i = 0; i < items; ++i) 2436 for (i = 0; i < items; ++i)
… …
2150 } 2438 }
2151 else 2439 else
2152 slf_argc = 0; 2440 slf_argc = 0;
2153 2441
2154 PL_op->op_ppaddr = pp_slf; 2442 PL_op->op_ppaddr = pp_slf;
2155 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2443 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2156 2444
2157 PL_op = (OP *)&slf_restore; 2445 PL_op = (OP *)&slf_restore;
2446}
2447
2448/*****************************************************************************/
2449/* dynamic wind */
2450
2451static void
2452on_enterleave_call (pTHX_ SV *cb)
2453{
2454 dSP;
2455
2456 PUSHSTACK;
2457
2458 PUSHMARK (SP);
2459 PUTBACK;
2460 call_sv (cb, G_VOID | G_DISCARD);
2461 SPAGAIN;
2462
2463 POPSTACK;
2464}
2465
2466static SV *
2467coro_avp_pop_and_free (pTHX_ AV **avp)
2468{
2469 AV *av = *avp;
2470 SV *res = av_pop (av);
2471
2472 if (AvFILLp (av) < 0)
2473 {
2474 *avp = 0;
2475 SvREFCNT_dec (av);
2476 }
2477
2478 return res;
2479}
2480
2481static void
2482coro_pop_on_enter (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2485 SvREFCNT_dec (cb);
2486}
2487
2488static void
2489coro_pop_on_leave (pTHX_ void *coro)
2490{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb));
2158} 2493}
2159 2494
2160/*****************************************************************************/ 2495/*****************************************************************************/
2161/* PerlIO::cede */ 2496/* PerlIO::cede */
2162 2497
… …
2236/* Coro::Semaphore & Coro::Signal */ 2571/* Coro::Semaphore & Coro::Signal */
2237 2572
2238static SV * 2573static SV *
2239coro_waitarray_new (pTHX_ int count) 2574coro_waitarray_new (pTHX_ int count)
2240{ 2575{
2241 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2576 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2242 AV *av = newAV (); 2577 AV *av = newAV ();
2243 SV **ary; 2578 SV **ary;
2244 2579
2245 /* unfortunately, building manually saves memory */ 2580 /* unfortunately, building manually saves memory */
2246 Newx (ary, 2, SV *); 2581 Newx (ary, 2, SV *);
2247 AvALLOC (av) = ary; 2582 AvALLOC (av) = ary;
2583#if PERL_VERSION_ATLEAST (5,10,0)
2248 /*AvARRAY (av) = ary;*/ 2584 AvARRAY (av) = ary;
2585#else
2249 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2586 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2587 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2588 SvPVX ((SV *)av) = (char *)ary;
2589#endif
2250 AvMAX (av) = 1; 2590 AvMAX (av) = 1;
2251 AvFILLp (av) = 0; 2591 AvFILLp (av) = 0;
2252 ary [0] = newSViv (count); 2592 ary [0] = newSViv (count);
2253 2593
2254 return newRV_noinc ((SV *)av); 2594 return newRV_noinc ((SV *)av);
… …
2383{ 2723{
2384 if (items >= 2) 2724 if (items >= 2)
2385 { 2725 {
2386 /* callback form */ 2726 /* callback form */
2387 AV *av = (AV *)SvRV (arg [0]); 2727 AV *av = (AV *)SvRV (arg [0]);
2388 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2728 SV *cb_cv = s_get_cv_croak (arg [1]);
2389 2729
2390 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2730 av_push (av, SvREFCNT_inc_NN (cb_cv));
2391 2731
2392 if (SvIVX (AvARRAY (av)[0]) > 0) 2732 if (SvIVX (AvARRAY (av)[0]) > 0)
2393 coro_semaphore_adjust (aTHX_ av, 0); 2733 coro_semaphore_adjust (aTHX_ av, 0);
2394 2734
2395 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
… …
2419 AvARRAY (av)[0] = AvARRAY (av)[1]; 2759 AvARRAY (av)[0] = AvARRAY (av)[1];
2420 AvARRAY (av)[1] = cb; 2760 AvARRAY (av)[1] = cb;
2421 2761
2422 cb = av_shift (av); 2762 cb = av_shift (av);
2423 2763
2764 if (SvTYPE (cb) == SVt_PVCV)
2765 {
2766 dSP;
2767 PUSHMARK (SP);
2768 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2769 PUTBACK;
2770 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2771 }
2772 else
2773 {
2424 api_ready (aTHX_ cb); 2774 api_ready (aTHX_ cb);
2425 sv_setiv (cb, 0); /* signal waiter */ 2775 sv_setiv (cb, 0); /* signal waiter */
2776 }
2777
2426 SvREFCNT_dec (cb); 2778 SvREFCNT_dec (cb);
2427 2779
2428 --count; 2780 --count;
2429 } 2781 }
2430} 2782}
… …
2439static void 2791static void
2440slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2792slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2441{ 2793{
2442 AV *av = (AV *)SvRV (arg [0]); 2794 AV *av = (AV *)SvRV (arg [0]);
2443 2795
2796 if (items >= 2)
2797 {
2798 SV *cb_cv = s_get_cv_croak (arg [1]);
2799 av_push (av, SvREFCNT_inc_NN (cb_cv));
2800
2444 if (SvIVX (AvARRAY (av)[0])) 2801 if (SvIVX (AvARRAY (av)[0]))
2802 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2803
2804 frame->prepare = prepare_nop;
2805 frame->check = slf_check_nop;
2806 }
2807 else if (SvIVX (AvARRAY (av)[0]))
2445 { 2808 {
2446 SvIVX (AvARRAY (av)[0]) = 0; 2809 SvIVX (AvARRAY (av)[0]) = 0;
2447 frame->prepare = prepare_nop; 2810 frame->prepare = prepare_nop;
2448 frame->check = slf_check_nop; 2811 frame->check = slf_check_nop;
2449 } 2812 }
2450 else 2813 else
2451 { 2814 {
2452 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2815 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2453 2816
2454 av_push (av, waiter); 2817 av_push (av, waiter);
2455 2818
2456 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2819 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2457 frame->prepare = prepare_schedule; 2820 frame->prepare = prepare_schedule;
… …
2475 2838
2476static void 2839static void
2477coro_aio_callback (pTHX_ CV *cv) 2840coro_aio_callback (pTHX_ CV *cv)
2478{ 2841{
2479 dXSARGS; 2842 dXSARGS;
2480 AV *state = (AV *)GENSUB_ARG; 2843 AV *state = (AV *)S_GENSUB_ARG;
2481 SV *coro = av_pop (state); 2844 SV *coro = av_pop (state);
2482 SV *data_sv = newSV (sizeof (struct io_state)); 2845 SV *data_sv = newSV (sizeof (struct io_state));
2483 2846
2484 av_extend (state, items - 1); 2847 av_extend (state, items - 1);
2485 2848
… …
2599 2962
2600 for (i = 0; i < items; ++i) 2963 for (i = 0; i < items; ++i)
2601 PUSHs (arg [i]); 2964 PUSHs (arg [i]);
2602 2965
2603 /* now push the callback closure */ 2966 /* now push the callback closure */
2604 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2967 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2605 2968
2606 /* now call the AIO function - we assume our request is uncancelable */ 2969 /* now call the AIO function - we assume our request is uncancelable */
2607 PUTBACK; 2970 PUTBACK;
2608 call_sv ((SV *)req, G_VOID | G_DISCARD); 2971 call_sv ((SV *)req, G_VOID | G_DISCARD);
2609 } 2972 }
2610 2973
2611 /* now that the requets is going, we loop toll we have a result */ 2974 /* now that the request is going, we loop till we have a result */
2612 frame->data = (void *)state; 2975 frame->data = (void *)state;
2613 frame->prepare = prepare_schedule; 2976 frame->prepare = prepare_schedule;
2614 frame->check = slf_check_aio_req; 2977 frame->check = slf_check_aio_req;
2615} 2978}
2616 2979
… …
2623 2986
2624 XSRETURN_EMPTY; 2987 XSRETURN_EMPTY;
2625} 2988}
2626 2989
2627/*****************************************************************************/ 2990/*****************************************************************************/
2991
2992#if CORO_CLONE
2993# include "clone.c"
2994#endif
2995
2996/*****************************************************************************/
2997
2998static SV *
2999coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3000{
3001 SV *coro_sv;
3002 struct coro *coro;
3003 MAGIC *mg;
3004 HV *hv;
3005 SV *cb;
3006 int i;
3007
3008 if (argc > 0)
3009 {
3010 cb = s_get_cv_croak (argv [0]);
3011
3012 if (!is_coro)
3013 {
3014 if (CvISXSUB (cb))
3015 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3016
3017 if (!CvROOT (cb))
3018 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3019 }
3020 }
3021
3022 Newz (0, coro, 1, struct coro);
3023 coro->args = newAV ();
3024 coro->flags = CF_NEW;
3025
3026 if (coro_first) coro_first->prev = coro;
3027 coro->next = coro_first;
3028 coro_first = coro;
3029
3030 coro->hv = hv = newHV ();
3031 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3034
3035 if (argc > 0)
3036 {
3037 av_extend (coro->args, argc + is_coro - 1);
3038
3039 if (is_coro)
3040 {
3041 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3042 cb = (SV *)cv_coro_run;
3043 }
3044
3045 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3046
3047 for (i = 1; i < argc; i++)
3048 av_push (coro->args, newSVsv (argv [i]));
3049 }
3050
3051 return coro_sv;
3052}
2628 3053
2629MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2630 3055
2631PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2632 3057
… …
2637 coro_thx = PERL_GET_CONTEXT; 3062 coro_thx = PERL_GET_CONTEXT;
2638# endif 3063# endif
2639#endif 3064#endif
2640 BOOT_PAGESIZE; 3065 BOOT_PAGESIZE;
2641 3066
3067 cctx_current = cctx_new_empty ();
3068
2642 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2643 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2644 3071
2645 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3072 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2646 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3073 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2665 3092
2666 { 3093 {
2667 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3094 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2668 3095
2669 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3096 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2670 hv_store_ent (PL_custom_op_names, slf, 3097 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2671 newSVpv ("coro_slf", 0), 0);
2672 3098
2673 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3099 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2674 hv_store_ent (PL_custom_op_descs, slf, 3100 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2675 newSVpv ("coro schedule like function", 0), 0);
2676 } 3101 }
2677 3102
2678 coroapi.ver = CORO_API_VERSION; 3103 coroapi.ver = CORO_API_VERSION;
2679 coroapi.rev = CORO_API_REVISION; 3104 coroapi.rev = CORO_API_REVISION;
2680 3105
… …
2692 3117
2693 if (!svp) croak ("Time::HiRes is required"); 3118 if (!svp) croak ("Time::HiRes is required");
2694 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2695 3120
2696 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2697 } 3125 }
2698 3126
2699 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2700} 3128}
2701 3129
2702SV * 3130SV *
2703new (char *klass, ...) 3131new (SV *klass, ...)
2704 ALIAS: 3132 ALIAS:
2705 Coro::new = 1 3133 Coro::new = 1
2706 CODE: 3134 CODE:
2707{ 3135 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2708 struct coro *coro; 3136 OUTPUT:
2709 MAGIC *mg;
2710 HV *hv;
2711 CV *cb;
2712 int i;
2713
2714 if (items > 1)
2715 {
2716 cb = coro_sv_2cv (aTHX_ ST (1));
2717
2718 if (!ix)
2719 {
2720 if (CvISXSUB (cb))
2721 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2722
2723 if (!CvROOT (cb))
2724 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2725 }
2726 }
2727
2728 Newz (0, coro, 1, struct coro);
2729 coro->args = newAV ();
2730 coro->flags = CF_NEW;
2731
2732 if (coro_first) coro_first->prev = coro;
2733 coro->next = coro_first;
2734 coro_first = coro;
2735
2736 coro->hv = hv = newHV ();
2737 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2738 mg->mg_flags |= MGf_DUP;
2739 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2740
2741 if (items > 1)
2742 {
2743 av_extend (coro->args, items - 1 + ix - 1);
2744
2745 if (ix)
2746 {
2747 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2748 cb = cv_coro_run;
2749 }
2750
2751 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2752
2753 for (i = 2; i < items; i++)
2754 av_push (coro->args, newSVsv (ST (i)));
2755 }
2756}
2757 OUTPUT:
2758 RETVAL 3137 RETVAL
2759 3138
2760void 3139void
2761transfer (...) 3140transfer (...)
2762 PROTOTYPE: $$ 3141 PROTOTYPE: $$
… …
2773void 3152void
2774_exit (int code) 3153_exit (int code)
2775 PROTOTYPE: $ 3154 PROTOTYPE: $
2776 CODE: 3155 CODE:
2777 _exit (code); 3156 _exit (code);
3157
3158SV *
3159clone (Coro::State coro)
3160 CODE:
3161{
3162#if CORO_CLONE
3163 struct coro *ncoro = coro_clone (aTHX_ coro);
3164 MAGIC *mg;
3165 /* TODO: too much duplication */
3166 ncoro->hv = newHV ();
3167 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3168 mg->mg_flags |= MGf_DUP;
3169 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3170#else
3171 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3172#endif
3173}
3174 OUTPUT:
3175 RETVAL
2778 3176
2779int 3177int
2780cctx_stacksize (int new_stacksize = 0) 3178cctx_stacksize (int new_stacksize = 0)
2781 PROTOTYPE: ;$ 3179 PROTOTYPE: ;$
2782 CODE: 3180 CODE:
… …
2832 eval = 1 3230 eval = 1
2833 CODE: 3231 CODE:
2834{ 3232{
2835 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2836 { 3234 {
2837 struct coro temp; 3235 struct coro *current = SvSTATE_current;
2838 3236
2839 if (!(coro->flags & CF_RUNNING)) 3237 if (current != coro)
2840 { 3238 {
2841 PUTBACK; 3239 PUTBACK;
2842 save_perl (aTHX_ &temp); 3240 save_perl (aTHX_ current);
2843 load_perl (aTHX_ coro); 3241 load_perl (aTHX_ coro);
3242 SPAGAIN;
2844 } 3243 }
2845 3244
2846 {
2847 dSP;
2848 ENTER;
2849 SAVETMPS;
2850 PUTBACK;
2851 PUSHSTACK; 3245 PUSHSTACK;
3246
2852 PUSHMARK (SP); 3247 PUSHMARK (SP);
3248 PUTBACK;
2853 3249
2854 if (ix) 3250 if (ix)
2855 eval_sv (coderef, 0); 3251 eval_sv (coderef, 0);
2856 else 3252 else
2857 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3253 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2858 3254
2859 POPSTACK; 3255 POPSTACK;
2860 SPAGAIN; 3256 SPAGAIN;
2861 FREETMPS;
2862 LEAVE;
2863 PUTBACK;
2864 }
2865 3257
2866 if (!(coro->flags & CF_RUNNING)) 3258 if (current != coro)
2867 { 3259 {
3260 PUTBACK;
2868 save_perl (aTHX_ coro); 3261 save_perl (aTHX_ coro);
2869 load_perl (aTHX_ &temp); 3262 load_perl (aTHX_ current);
2870 SPAGAIN; 3263 SPAGAIN;
2871 } 3264 }
2872 } 3265 }
2873} 3266}
2874 3267
… …
2878 ALIAS: 3271 ALIAS:
2879 is_ready = CF_READY 3272 is_ready = CF_READY
2880 is_running = CF_RUNNING 3273 is_running = CF_RUNNING
2881 is_new = CF_NEW 3274 is_new = CF_NEW
2882 is_destroyed = CF_DESTROYED 3275 is_destroyed = CF_DESTROYED
3276 is_suspended = CF_SUSPENDED
2883 CODE: 3277 CODE:
2884 RETVAL = boolSV (coro->flags & ix); 3278 RETVAL = boolSV (coro->flags & ix);
2885 OUTPUT: 3279 OUTPUT:
2886 RETVAL 3280 RETVAL
2887 3281
2888void 3282void
2889throw (Coro::State self, SV *throw = &PL_sv_undef) 3283throw (Coro::State self, SV *exception = &PL_sv_undef)
2890 PROTOTYPE: $;$ 3284 PROTOTYPE: $;$
2891 CODE: 3285 CODE:
2892{ 3286{
2893 struct coro *current = SvSTATE_current; 3287 struct coro *current = SvSTATE_current;
2894 SV **throwp = self == current ? &CORO_THROW : &self->except; 3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2895 SvREFCNT_dec (*throwp); 3289 SvREFCNT_dec (*exceptionp);
2896 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2897} 3292}
2898 3293
2899void 3294void
2900api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2901 PROTOTYPE: $;$ 3296 PROTOTYPE: $;$
… …
2903 3298
2904SV * 3299SV *
2905has_cctx (Coro::State coro) 3300has_cctx (Coro::State coro)
2906 PROTOTYPE: $ 3301 PROTOTYPE: $
2907 CODE: 3302 CODE:
2908 RETVAL = boolSV (!!coro->cctx); 3303 /* maybe manage the running flag differently */
3304 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2909 OUTPUT: 3305 OUTPUT:
2910 RETVAL 3306 RETVAL
2911 3307
2912int 3308int
2913is_traced (Coro::State coro) 3309is_traced (Coro::State coro)
… …
2933 3329
2934void 3330void
2935force_cctx () 3331force_cctx ()
2936 PROTOTYPE: 3332 PROTOTYPE:
2937 CODE: 3333 CODE:
2938 SvSTATE_current->cctx->idle_sp = 0; 3334 cctx_current->idle_sp = 0;
2939 3335
2940void 3336void
2941swap_defsv (Coro::State self) 3337swap_defsv (Coro::State self)
2942 PROTOTYPE: $ 3338 PROTOTYPE: $
2943 ALIAS: 3339 ALIAS:
… …
2951 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3347 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2952 3348
2953 SV *tmp = *src; *src = *dst; *dst = tmp; 3349 SV *tmp = *src; *src = *dst; *dst = tmp;
2954 } 3350 }
2955 3351
3352void
3353cancel (Coro::State self)
3354 CODE:
3355 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358
3359SV *
3360enable_times (int enabled = enable_times)
3361 CODE:
3362{
3363 RETVAL = boolSV (enable_times);
3364
3365 if (enabled != enable_times)
3366 {
3367 enable_times = enabled;
3368
3369 coro_times_update ();
3370 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3371 }
3372}
3373 OUTPUT:
3374 RETVAL
3375
3376void
3377times (Coro::State self)
3378 PPCODE:
3379{
3380 struct coro *current = SvSTATE (coro_current);
3381
3382 if (expect_false (current == self))
3383 {
3384 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current));
3386 }
3387
3388 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391
3392 if (expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current));
3394}
3395
3396void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3398 CODE:
3399{
3400 struct coro *current = SvSTATE_current;
3401
3402 if (current == coro)
3403 SWAP_SVS (current);
3404
3405 if (!coro->swap_sv)
3406 coro->swap_sv = newAV ();
3407
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3410
3411 if (current == coro)
3412 SWAP_SVS (current);
3413}
3414
2956 3415
2957MODULE = Coro::State PACKAGE = Coro 3416MODULE = Coro::State PACKAGE = Coro
2958 3417
2959BOOT: 3418BOOT:
2960{ 3419{
2961 int i;
2962
2963 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2964 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2965 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2966 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2967 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2968 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2969 3429
2970 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2971 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2972 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2973 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
2974 3434
2975 coro_stash = gv_stashpv ("Coro", TRUE); 3435 coro_stash = gv_stashpv ("Coro", TRUE);
2976 3436
2977 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2978 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2979 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2980 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3440 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2981 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3441 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2982 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3442 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2983
2984 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2985 coro_ready[i] = newAV ();
2986 3443
2987 { 3444 {
2988 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3445 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2989 3446
2990 coroapi.schedule = api_schedule; 3447 coroapi.schedule = api_schedule;
3448 coroapi.schedule_to = api_schedule_to;
2991 coroapi.cede = api_cede; 3449 coroapi.cede = api_cede;
2992 coroapi.cede_notself = api_cede_notself; 3450 coroapi.cede_notself = api_cede_notself;
2993 coroapi.ready = api_ready; 3451 coroapi.ready = api_ready;
2994 coroapi.is_ready = api_is_ready; 3452 coroapi.is_ready = api_is_ready;
2995 coroapi.nready = coro_nready; 3453 coroapi.nready = coro_nready;
… …
2999 sv_setiv (sv, (IV)&coroapi); 3457 sv_setiv (sv, (IV)&coroapi);
3000 SvREADONLY_on (sv); 3458 SvREADONLY_on (sv);
3001 } 3459 }
3002} 3460}
3003 3461
3462SV *
3463async (...)
3464 PROTOTYPE: &@
3465 CODE:
3466 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3467 api_ready (aTHX_ RETVAL);
3468 OUTPUT:
3469 RETVAL
3470
3471void
3472terminate (...)
3473 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3475
3004void 3476void
3005schedule (...) 3477schedule (...)
3006 CODE: 3478 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3479 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3480
3481void
3482schedule_to (...)
3483 CODE:
3484 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3485
3486void
3487cede_to (...)
3488 CODE:
3489 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3008 3490
3009void 3491void
3010cede (...) 3492cede (...)
3011 CODE: 3493 CODE:
3012 CORO_EXECUTE_SLF_XS (slf_init_cede); 3494 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3026void 3508void
3027_set_readyhook (SV *hook) 3509_set_readyhook (SV *hook)
3028 PROTOTYPE: $ 3510 PROTOTYPE: $
3029 CODE: 3511 CODE:
3030 SvREFCNT_dec (coro_readyhook); 3512 SvREFCNT_dec (coro_readyhook);
3513 SvGETMAGIC (hook);
3514 if (SvOK (hook))
3515 {
3031 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3516 coro_readyhook = newSVsv (hook);
3517 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3518 }
3519 else
3520 {
3521 coro_readyhook = 0;
3522 CORO_READYHOOK = 0;
3523 }
3032 3524
3033int 3525int
3034prio (Coro::State coro, int newprio = 0) 3526prio (Coro::State coro, int newprio = 0)
3035 PROTOTYPE: $;$ 3527 PROTOTYPE: $;$
3036 ALIAS: 3528 ALIAS:
… …
3042 if (items > 1) 3534 if (items > 1)
3043 { 3535 {
3044 if (ix) 3536 if (ix)
3045 newprio = coro->prio - newprio; 3537 newprio = coro->prio - newprio;
3046 3538
3047 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3539 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3048 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3540 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3049 3541
3050 coro->prio = newprio; 3542 coro->prio = newprio;
3051 } 3543 }
3052} 3544}
3053 OUTPUT: 3545 OUTPUT:
… …
3068 RETVAL = coro_nready; 3560 RETVAL = coro_nready;
3069 OUTPUT: 3561 OUTPUT:
3070 RETVAL 3562 RETVAL
3071 3563
3072void 3564void
3565suspend (Coro::State self)
3566 PROTOTYPE: $
3567 CODE:
3568 self->flags |= CF_SUSPENDED;
3569
3570void
3571resume (Coro::State self)
3572 PROTOTYPE: $
3573 CODE:
3574 self->flags &= ~CF_SUSPENDED;
3575
3576void
3073_pool_handler (...) 3577_pool_handler (...)
3074 CODE: 3578 CODE:
3075 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3579 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3076 3580
3077void 3581void
… …
3088 for (i = 1; i < items; ++i) 3592 for (i = 1; i < items; ++i)
3089 av_push (av, SvREFCNT_inc_NN (ST (i))); 3593 av_push (av, SvREFCNT_inc_NN (ST (i)));
3090 3594
3091 if ((SV *)hv == &PL_sv_undef) 3595 if ((SV *)hv == &PL_sv_undef)
3092 { 3596 {
3093 PUSHMARK (SP); 3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3094 EXTEND (SP, 2);
3095 PUSHs (sv_Coro);
3096 PUSHs ((SV *)cv_pool_handler);
3097 PUTBACK;
3098 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3099 SPAGAIN;
3100
3101 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3599 SvREFCNT_dec (sv);
3102 } 3600 }
3103 3601
3104 { 3602 {
3105 struct coro *coro = SvSTATE_hv (hv); 3603 struct coro *coro = SvSTATE_hv (hv);
3106 3604
… …
3130rouse_wait (...) 3628rouse_wait (...)
3131 PROTOTYPE: ;$ 3629 PROTOTYPE: ;$
3132 PPCODE: 3630 PPCODE:
3133 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3631 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3134 3632
3633void
3634on_enter (SV *block)
3635 ALIAS:
3636 on_leave = 1
3637 PROTOTYPE: &
3638 CODE:
3639{
3640 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642
3643 block = s_get_cv_croak (block);
3644
3645 if (!*avp)
3646 *avp = newAV ();
3647
3648 av_push (*avp, SvREFCNT_inc (block));
3649
3650 if (!ix)
3651 on_enterleave_call (aTHX_ block);
3652
3653 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3654 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3655 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3656}
3657
3135 3658
3136MODULE = Coro::State PACKAGE = PerlIO::cede 3659MODULE = Coro::State PACKAGE = PerlIO::cede
3137 3660
3138BOOT: 3661BOOT:
3139 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3662 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3142MODULE = Coro::State PACKAGE = Coro::Semaphore 3665MODULE = Coro::State PACKAGE = Coro::Semaphore
3143 3666
3144SV * 3667SV *
3145new (SV *klass, SV *count = 0) 3668new (SV *klass, SV *count = 0)
3146 CODE: 3669 CODE:
3670{
3671 int semcnt = 1;
3672
3673 if (count)
3674 {
3675 SvGETMAGIC (count);
3676
3677 if (SvOK (count))
3678 semcnt = SvIV (count);
3679 }
3680
3147 RETVAL = sv_bless ( 3681 RETVAL = sv_bless (
3148 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3682 coro_waitarray_new (aTHX_ semcnt),
3149 GvSTASH (CvGV (cv)) 3683 GvSTASH (CvGV (cv))
3150 ); 3684 );
3685}
3151 OUTPUT: 3686 OUTPUT:
3152 RETVAL 3687 RETVAL
3153 3688
3154# helper for Coro::Channel 3689# helper for Coro::Channel and others
3155SV * 3690SV *
3156_alloc (int count) 3691_alloc (int count)
3157 CODE: 3692 CODE:
3158 RETVAL = coro_waitarray_new (aTHX_ count); 3693 RETVAL = coro_waitarray_new (aTHX_ count);
3159 OUTPUT: 3694 OUTPUT:
… …
3217 for (i = 1; i <= wcount; ++i) 3752 for (i = 1; i <= wcount; ++i)
3218 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3753 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3219 } 3754 }
3220} 3755}
3221 3756
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758
3759void
3760_may_delete (SV *sem, int count, int extra_refs)
3761 PPCODE:
3762{
3763 AV *av = (AV *)SvRV (sem);
3764
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES;
3769
3770 XSRETURN_NO;
3771}
3772
3222MODULE = Coro::State PACKAGE = Coro::Signal 3773MODULE = Coro::State PACKAGE = Coro::Signal
3223 3774
3224SV * 3775SV *
3225new (SV *klass) 3776new (SV *klass)
3226 CODE: 3777 CODE:
… …
3297 3848
3298void 3849void
3299_register (char *target, char *proto, SV *req) 3850_register (char *target, char *proto, SV *req)
3300 CODE: 3851 CODE:
3301{ 3852{
3302 CV *req_cv = coro_sv_2cv (aTHX_ req); 3853 SV *req_cv = s_get_cv_croak (req);
3303 /* newXSproto doesn't return the CV on 5.8 */ 3854 /* newXSproto doesn't return the CV on 5.8 */
3304 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3855 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3305 sv_setpv ((SV *)slf_cv, proto); 3856 sv_setpv ((SV *)slf_cv, proto);
3306 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3857 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3307} 3858}
3308 3859
3860MODULE = Coro::State PACKAGE = Coro::Select
3861
3862void
3863patch_pp_sselect ()
3864 CODE:
3865 if (!coro_old_pp_sselect)
3866 {
3867 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3868 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3869 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3870 }
3871
3872void
3873unpatch_pp_sselect ()
3874 CODE:
3875 if (coro_old_pp_sselect)
3876 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0;
3879 }
3880
3881

Diff Legend

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