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.307 by root, Wed Nov 19 14:34:46 2008 UTC vs.
Revision 1.364 by root, Thu Jul 16 02:19:17 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
111#endif 58#endif
112 59
113#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
127#else 74#else
128# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
130#endif 77#endif
131 78
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
133 80
134#if __GNUC__ >= 3 81#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 84# define INLINE static inline
138#else 85#else
139# define attribute(x) 86# define attribute(x)
140# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
141# define INLINE static 88# define INLINE static
… …
153# if CORO_PTHREAD 100# if CORO_PTHREAD
154static void *coro_thx; 101static void *coro_thx;
155# endif 102# endif
156#endif 103#endif
157 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
158static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
159 117
160/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
163 121
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 126static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
172static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 136static SV *rv_diehook;
175static SV *rv_warnhook; 137static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
177 139
178/* async_pool helper stuff */ 140/* async_pool helper stuff */
179static SV *sv_pool_rss; 141static SV *sv_pool_rss;
180static SV *sv_pool_size; 142static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
182 148
183/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
184static SV *sv_activity; 150static SV *sv_activity;
151
152/* enable processtime/realtime profiling */
153static char enable_times;
154typedef U32 coro_ts[2];
155static coro_ts time_real, time_cpu;
156static char times_valid;
185 157
186static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
188 160
189enum { 161enum {
… …
215 int valgrind_id; 187 int valgrind_id;
216#endif 188#endif
217 unsigned char flags; 189 unsigned char flags;
218} coro_cctx; 190} coro_cctx;
219 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
220enum { 196enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 202};
226 203
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 204/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 205typedef struct
229{ 206{
230 SV *defsv; 207 SV *defsv;
231 AV *defav; 208 AV *defav;
232 SV *errsv; 209 SV *errsv;
233 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
234#define VAR(name,type) type name; 212#define VAR(name,type) type name;
235# include "state.h" 213# include "state.h"
236#undef VAR 214#undef VAR
237} perl_slots; 215} perl_slots;
238 216
… …
240 218
241/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
242struct coro { 220struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
245 226
246 /* state data */ 227 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 229 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
… …
263 SV *except; /* exception to be thrown */ 244 SV *except; /* exception to be thrown */
264 SV *rouse_cb; 245 SV *rouse_cb;
265 246
266 /* async_pool */ 247 /* async_pool */
267 SV *saved_deffh; 248 SV *saved_deffh;
249 SV *invoke_cb;
250 AV *invoke_av;
251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
268 258
269 /* linked list */ 259 /* linked list */
270 struct coro *next, *prev; 260 struct coro *next, *prev;
271}; 261};
272 262
… …
278/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
279static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
280 270
281/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
282 272
283#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
284#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
285#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
286#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
287#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
288#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
289 279
290/* for Coro.pm */ 280/* for Coro.pm */
291static SV *coro_current; 281static SV *coro_current;
292static SV *coro_readyhook; 282static SV *coro_readyhook;
293static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
284static CV *cv_coro_run, *cv_coro_terminate;
294static struct coro *coro_first; 285static struct coro *coro_first;
295#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
287
288/** Coro::Select ************************************************************/
289
290static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select;
292
293/* horrible hack, but if it works... */
294static OP *
295coro_pp_sselect (aTHX)
296{
297 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select);
300 PUTBACK;
301
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX);
306}
296 307
297/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
298 309
299static SV * 310static SV *
300coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
324 get_hv (name, create); 335 get_hv (name, create);
325#endif 336#endif
326 return get_hv (name, create); 337 return get_hv (name, create);
327} 338}
328 339
329/* may croak */ 340INLINE void
330INLINE CV * 341coro_times_update ()
331coro_sv_2cv (SV *sv)
332{ 342{
343#ifdef coro_clock_gettime
344 struct timespec ts;
345
346 ts.tv_sec = ts.tv_nsec = 0;
347 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
348 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
349
350 ts.tv_sec = ts.tv_nsec = 0;
351 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
352 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
353#else
354 dTHX;
355 UV tv[2];
356
357 u2time (aTHX_ tv);
358 time_real [0] = tv [0];
359 time_real [1] = tv [1] * 1000;
360#endif
361}
362
363INLINE void
364coro_times_add (struct coro *c)
365{
366 c->t_real [1] += time_real [1];
367 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
368 c->t_real [0] += time_real [0];
369
370 c->t_cpu [1] += time_cpu [1];
371 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
372 c->t_cpu [0] += time_cpu [0];
373}
374
375INLINE void
376coro_times_sub (struct coro *c)
377{
378 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
379 c->t_real [1] -= time_real [1];
380 c->t_real [0] -= time_real [0];
381
382 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
383 c->t_cpu [1] -= time_cpu [1];
384 c->t_cpu [0] -= time_cpu [0];
385}
386
387/*****************************************************************************/
388/* magic glue */
389
390#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext
392
393#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \
396 : mg_find (sv, type))
397
398#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \
401 : 0)
402
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405
406INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro)
408{
333 HV *st; 409 HV *stash;
334 GV *gvp; 410 MAGIC *mg;
335 return sv_2cv (sv, &st, &gvp, 0); 411
412 if (SvROK (coro))
413 coro = SvRV (coro);
414
415 if (expect_false (SvTYPE (coro) != SVt_PVHV))
416 croak ("Coro::State object required");
417
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr;
336} 428}
429
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431
432/* faster than SvSTATE, but expects a coroutine hv */
433#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435
436/*****************************************************************************/
437/* padlist management and caching */
337 438
338static AV * 439static AV *
339coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
340{ 441{
341 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
342 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
343 444
344 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
349 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
350#endif 451#endif
351 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
352 --AvFILLp (padlist); 453 --AvFILLp (padlist);
353 454
354 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
355 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
356 457
357 return newpadlist; 458 return newpadlist;
358} 459}
359 460
360static void 461static void
361free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
362{ 463{
363 /* may be during global destruction */ 464 /* may be during global destruction */
364 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
365 { 466 {
366 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
367 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
368 { 470 {
369 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
370 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
371 { 473 I32 j = AvFILLp (av);
372 SV *sv; 474
373 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
374 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
375
376 SvREFCNT_dec (*svp);
377 }
378 } 480 }
379 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
380 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
381 } 486 }
382} 487}
383 488
384static int 489static int
385coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
386{ 491{
387 AV *padlist; 492 AV *padlist;
388 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return 0;
389 498
390 /* casting is fun. */ 499 /* casting is fun. */
391 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
392 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
393 502
394 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
395 504
396 return 0; 505 return 0;
397} 506}
398
399#define CORO_MAGIC_type_cv 26
400#define CORO_MAGIC_type_state PERL_MAGIC_ext
401 507
402static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
403 0, 0, 0, 0, 509 0, 0, 0, 0,
404 coro_cv_free 510 coro_cv_free
405}; 511};
406
407#define CORO_MAGIC_NN(sv, type) \
408 (expect_true (SvMAGIC (sv)->mg_type == type) \
409 ? SvMAGIC (sv) \
410 : mg_find (sv, type))
411
412#define CORO_MAGIC(sv, type) \
413 (expect_true (SvMAGIC (sv)) \
414 ? CORO_MAGIC_NN (sv, type) \
415 : 0)
416
417#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
418#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
419
420INLINE struct coro *
421SvSTATE_ (pTHX_ SV *coro)
422{
423 HV *stash;
424 MAGIC *mg;
425
426 if (SvROK (coro))
427 coro = SvRV (coro);
428
429 if (expect_false (SvTYPE (coro) != SVt_PVHV))
430 croak ("Coro::State object required");
431
432 stash = SvSTASH (coro);
433 if (expect_false (stash != coro_stash && stash != coro_state_stash))
434 {
435 /* very slow, but rare, check */
436 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
437 croak ("Coro::State object required");
438 }
439
440 mg = CORO_MAGIC_state (coro);
441 return (struct coro *)mg->mg_ptr;
442}
443
444#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
445
446/* faster than SvSTATE, but expects a coroutine hv */
447#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
448#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
449 512
450/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
451static void 514static void
452get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
453{ 516{
… …
464 CV *cp = Perl_cv_clone (aTHX_ cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
465 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
466 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
467 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
468#else 531#else
469 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
470#endif 533#endif
471 } 534 }
472} 535}
473 536
474static void 537static void
… …
481 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
482 545
483 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
484 547
485 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
486 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
487 550
488 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
489} 552}
490 553
491/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
492 558
493static void 559static void
494load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
495{ 561{
496 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
497 c->slot = 0; 563 c->slot = 0;
498 564
499 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
500 566
501 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
502 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
503 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
504 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
505 572
506 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
507 # include "state.h" 574 # include "state.h"
508 #undef VAR 575 #undef VAR
509 576
… …
523 PUTBACK; 590 PUTBACK;
524 } 591 }
525 592
526 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
527 CORO_THROW = c->except; 594 CORO_THROW = c->except;
595
596 if (expect_false (enable_times))
597 {
598 if (expect_false (!times_valid))
599 coro_times_update ();
600
601 coro_times_sub (c);
602 }
603
604 if (expect_false (c->on_enter))
605 {
606 int i;
607
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 }
528} 611}
529 612
530static void 613static void
531save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
532{ 615{
616 if (expect_false (c->on_leave))
617 {
618 int i;
619
620 for (i = AvFILLp (c->on_leave); i >= 0; --i)
621 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
622 }
623
624 times_valid = 0;
625
626 if (expect_false (enable_times))
627 {
628 coro_times_update (); times_valid = 1;
629 coro_times_add (c);
630 }
631
533 c->except = CORO_THROW; 632 c->except = CORO_THROW;
534 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
535 634
536 { 635 {
537 dSP; 636 dSP;
… …
550 { 649 {
551 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
552 { 651 {
553 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
554 653
555 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 654 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
556 { 655 {
557 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
558 657
559 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
560 { 659 {
… …
584 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
585 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
586 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
587 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
588 { 687 {
589 int i; 688 unsigned int i;
590 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
591 CXINC; 690 CXINC;
592 } 691 }
593 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
594 693
595 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
596 695
597 { 696 {
598 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
599 698
600 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
601 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
602 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
603 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
604 704
605 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
606 # include "state.h" 706 # include "state.h"
607 #undef VAR 707 #undef VAR
608 } 708 }
… …
686#if !PERL_VERSION_ATLEAST (5,10,0) 786#if !PERL_VERSION_ATLEAST (5,10,0)
687 Safefree (PL_retstack); 787 Safefree (PL_retstack);
688#endif 788#endif
689} 789}
690 790
791#define CORO_RSS \
792 rss += sizeof (SYM (curstackinfo)); \
793 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
794 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
795 rss += SYM (tmps_max) * sizeof (SV *); \
796 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
797 rss += SYM (scopestack_max) * sizeof (I32); \
798 rss += SYM (savestack_max) * sizeof (ANY);
799
691static size_t 800static size_t
692coro_rss (pTHX_ struct coro *coro) 801coro_rss (pTHX_ struct coro *coro)
693{ 802{
694 size_t rss = sizeof (*coro); 803 size_t rss = sizeof (*coro);
695 804
696 if (coro->mainstack) 805 if (coro->mainstack)
697 { 806 {
698 perl_slots tmp_slot;
699 perl_slots *slot;
700
701 if (coro->flags & CF_RUNNING) 807 if (coro->flags & CF_RUNNING)
702 { 808 {
703 slot = &tmp_slot; 809 #define SYM(sym) PL_ ## sym
704 810 CORO_RSS;
705 #define VAR(name,type) slot->name = PL_ ## name;
706 # include "state.h"
707 #undef VAR 811 #undef SYM
708 } 812 }
709 else 813 else
710 slot = coro->slot;
711
712 if (slot)
713 { 814 {
714 rss += sizeof (slot->curstackinfo); 815 #define SYM(sym) coro->slot->sym
715 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 816 CORO_RSS;
716 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 817 #undef SYM
717 rss += slot->tmps_max * sizeof (SV *);
718 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
719 rss += slot->scopestack_max * sizeof (I32);
720 rss += slot->savestack_max * sizeof (ANY);
721
722#if !PERL_VERSION_ATLEAST (5,10,0)
723 rss += slot->retstack_max * sizeof (OP *);
724#endif
725 } 818 }
726 } 819 }
727 820
728 return rss; 821 return rss;
729} 822}
… …
742#endif 835#endif
743 836
744/* 837/*
745 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
746 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 839 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
747 * and instead of tryign to save and restore the hash elements, we just provide 840 * and instead of trying to save and restore the hash elements, we just provide
748 * readback here. 841 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 842 */
753static int 843static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 845{
756 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 900
811 if (svp) 901 if (svp)
812 { 902 {
813 SV *old = *svp; 903 SV *old = *svp;
814 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
816 return 0; 906 return 0;
817 } 907 }
818 } 908 }
819 909
… …
829 919
830static int 920static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 921slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 922{
833 return 0; 923 return 0;
924}
925
926static int
927slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{
929 return 1;
834} 930}
835 931
836static UNOP coro_setup_op; 932static UNOP coro_setup_op;
837 933
838static void NOINLINE /* noinline to keep it out of the transfer fast path */ 934static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
845 941
846 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 949 PL_curpm = 0;
851 PL_curpad = 0; 950 PL_curpad = 0;
852 PL_localizing = 0; 951 PL_localizing = 0;
853 PL_dirty = 0; 952 PL_dirty = 0;
854 PL_restartop = 0; 953 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 955 PL_parser = 0;
857#endif 956#endif
957 PL_hints = 0;
858 958
859 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
860 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 960 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
861 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 961 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
862 962
863 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
866 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 966 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
967 GvHV (PL_hintgv) = 0;
867 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 970
870 { 971 {
871 dSP; 972 dSP;
872 UNOP myop; 973 UNOP myop;
873 974
874 Zero (&myop, 1, UNOP); 975 Zero (&myop, 1, UNOP);
875 myop.op_next = Nullop; 976 myop.op_next = Nullop;
977 myop.op_type = OP_ENTERSUB;
876 myop.op_flags = OPf_WANT_VOID; 978 myop.op_flags = OPf_WANT_VOID;
877 979
878 PUSHMARK (SP); 980 PUSHMARK (SP);
879 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 981 PUSHs ((SV *)coro->startcv);
880 PUTBACK; 982 PUTBACK;
881 PL_op = (OP *)&myop; 983 PL_op = (OP *)&myop;
882 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 984 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
883 SPAGAIN;
884 } 985 }
885 986
886 /* this newly created coroutine might be run on an existing cctx which most 987 /* this newly created coroutine might be run on an existing cctx which most
887 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 988 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
888 */ 989 */
889 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 990 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
890 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 991 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
891 992
892 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 993 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
893 coro_setup_op.op_next = PL_op; 994 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 995 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 996 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags required, as an init function won't be called */ 997 /* no flags etc. required, as an init function won't be called */
897 998
898 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
899 1000
900 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
902}
903 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
904static void 1011static void
905coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
906{ 1013{
907 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
908 { 1015 {
909 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
919 1026
920 /* unwind main stack */ 1027 /* unwind main stack */
921 dounwind (-1); 1028 dounwind (-1);
922 } 1029 }
1030}
923 1031
924 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
927 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1036
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1037 {
934 SvREFCNT_dec (CORO_THROW); 1038 struct coro *current = SvSTATE_current;
1039
1040 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1041
1042 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro);
1044
1045 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX);
1047
1048 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv);
1052 svf [3] = (SV *)PL_defoutgv;
1053 svf [4] = PL_rs;
1054 svf [5] = GvSV (irsgv);
1055 svf [6] = (SV *)GvHV (PL_hintgv);
1056 svf [7] = PL_diehook;
1057 svf [8] = PL_warnhook;
1058 assert (9 == sizeof (svf) / sizeof (*svf));
1059
1060 load_perl (aTHX_ current);
1061 }
1062
1063 {
1064 unsigned int i;
1065
1066 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1067 SvREFCNT_dec (svf [i]);
1068
935 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
936 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
937 1071 SvREFCNT_dec (coro->invoke_cb);
938 coro_destruct_stacks (aTHX); 1072 SvREFCNT_dec (coro->invoke_av);
1073 }
939} 1074}
940 1075
941INLINE void 1076INLINE void
942free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
943{ 1078{
… …
951static int 1086static int
952runops_trace (pTHX) 1087runops_trace (pTHX)
953{ 1088{
954 COP *oldcop = 0; 1089 COP *oldcop = 0;
955 int oldcxix = -2; 1090 int oldcxix = -2;
956 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
957 coro_cctx *cctx = coro->cctx;
958 1091
959 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
960 { 1093 {
961 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
962 1095
963 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
964 { 1097 {
965 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1098 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
966 { 1099 {
967 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
968 SV **bot, **top; 1101 SV **bot, **top;
969 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
970 SV **cb; 1103 SV **cb;
… …
1007 1140
1008 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
1009 { 1142 {
1010 SV **cb; 1143 SV **cb;
1011 1144
1012 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1013 { 1146 {
1014 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1015 1148
1016 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1017 { 1150 {
1018 runops_proc_t old_runops = PL_runops;
1019 dSP; 1151 dSP;
1020 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
1021 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
1022 1154
1023 if (isGV (gv)) 1155 if (isGV (gv))
… …
1041 } 1173 }
1042 1174
1043 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1044 } 1176 }
1045 1177
1046 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1047 { 1179 {
1048 dSP; 1180 dSP;
1049 1181
1050 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1051 ENTER; 1183 ENTER;
… …
1070 1202
1071 TAINT_NOT; 1203 TAINT_NOT;
1072 return 0; 1204 return 0;
1073} 1205}
1074 1206
1075static struct coro_cctx *cctx_ssl_cctx;
1076static struct CoroSLF cctx_ssl_frame; 1207static struct CoroSLF cctx_ssl_frame;
1077 1208
1078static void 1209static void
1079slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1080{ 1211{
1081 ta->prev = (struct coro *)cctx_ssl_cctx;
1082 ta->next = 0; 1212 ta->prev = 0;
1083} 1213}
1084 1214
1085static int 1215static int
1086slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1087{ 1217{
… …
1090 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1220 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1091} 1221}
1092 1222
1093/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1223/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1094static void NOINLINE 1224static void NOINLINE
1095cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1096{ 1226{
1097 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1098 1228
1099 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1100 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1101 1231
1102 /* we already must be executing an SLF op, there is no other valid way 1232 /* we already must be executing an SLF op, there is no other valid way
1103 * that can lead to creation of a new cctx */ 1233 * that can lead to creation of a new cctx */
1104 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1234 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1105 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1106 1236
1107 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1237 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1108 cctx_ssl_cctx = cctx;
1109 cctx_ssl_frame = slf_frame; 1238 cctx_ssl_frame = slf_frame;
1110 1239
1111 slf_frame.prepare = slf_prepare_set_stacklevel; 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1112 slf_frame.check = slf_check_set_stacklevel; 1241 slf_frame.check = slf_check_set_stacklevel;
1113} 1242}
… …
1136 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1137 /* not doing so will re-execute it, which is exactly what we want */ 1266 /* not doing so will re-execute it, which is exactly what we want */
1138 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1139 1268
1140 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1141 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1142 1271
1143 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1144 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1145 1274
1146 /* somebody or something will hit me for both perl_run and PL_restartop */ 1275 /* somebody or something will hit me for both perl_run and PL_restartop */
1147 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1148 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1278 /*
1279 * Unfortunately, there is no way to get at the return values of the
1280 * coro body here, as perl_run destroys these
1281 */
1149 1282
1150 /* 1283 /*
1151 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1152 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1153 * reason for perl_run to return. We try to exit by jumping to the 1286 * reason for perl_run to return. We try to exit by jumping to the
1154 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1155 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1156 */ 1291 */
1157 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1158 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1159 } 1294 }
1160} 1295}
… …
1237cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1238{ 1373{
1239 if (!cctx) 1374 if (!cctx)
1240 return; 1375 return;
1241 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1242 --cctx_count; 1379 --cctx_count;
1243 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1244 1381
1245 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1246 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1309 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1310 1447
1311 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1312 { 1449 {
1313 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1314 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1315 1452
1316 if (expect_false (next->flags & CF_RUNNING))
1317 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1318
1319 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1320 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1321 1455
1322#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1323 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1324 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1325#endif 1459#endif
… …
1331transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1332{ 1466{
1333 dSTACKLEVEL; 1467 dSTACKLEVEL;
1334 1468
1335 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1336 if (expect_false (!next)) 1470 if (expect_false (!prev))
1337 { 1471 {
1338 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1472 cctx_current->idle_sp = STACKLEVEL;
1339 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1340 } 1474 }
1341 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1342 { 1476 {
1343 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1344 1478
1345 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1346 { 1480 {
1347 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1348 prev->cctx = cctx_new_empty ();
1349 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1350 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1351 } 1484 }
1352 1485
1353 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1364 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1365 } 1498 }
1366 else 1499 else
1367 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1368 1501
1369 prev__cctx = prev->cctx;
1370
1371 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1372 if (expect_true ( 1503 if (expect_true (
1373 prev__cctx->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1374 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1375 && !force_cctx 1506 && !force_cctx
1376 )) 1507 ))
1377 { 1508 {
1378 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1379 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1380 1511
1381 prev->cctx = 0;
1382
1383 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1384 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1513 /* without this the next cctx_get might destroy the running cctx while still in use */
1385 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1386 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1387 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1388 1517
1389 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1390 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1391 1522
1392 ++next->usecount; 1523 ++next->usecount;
1393 1524
1394 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1395 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1396 1527
1397 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1398 { 1531 {
1399 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1400 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1401 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1402 } 1535 }
1403 1536
1404 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1405 } 1538 }
1406} 1539}
… …
1414coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1415{ 1548{
1416 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1417 return 0; 1550 return 0;
1418 1551
1419 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1420 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1421 1554
1422 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1423 1556
1424 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1428 --coro_nready; 1561 --coro_nready;
1429 } 1562 }
1430 else 1563 else
1431 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1432 1565
1433 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1434 { 1567 && coro->mainstack != main_mainstack
1435 struct coro temp; 1568 && coro->slot
1436 1569 && !PL_dirty)
1437 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1438
1439 save_perl (aTHX_ &temp);
1440 load_perl (aTHX_ coro);
1441
1442 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1443
1444 load_perl (aTHX_ &temp);
1445
1446 coro->slot = 0;
1447 }
1448 1571
1449 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1450 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1451 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1575 SvREFCNT_dec (CORO_THROW);
1452 1576
1453 if (coro->next) coro->next->prev = coro->prev; 1577 if (coro->next) coro->next->prev = coro->prev;
1454 if (coro->prev) coro->prev->next = coro->next; 1578 if (coro->prev) coro->prev->next = coro->next;
1455 if (coro == coro_first) coro_first = coro->next; 1579 if (coro == coro_first) coro_first = coro->next;
1456 1580
… …
1510 1634
1511 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1512 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1513} 1637}
1514 1638
1515/*****************************************************************************/
1516/* gensub: simple closure generation utility */
1517
1518#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1519
1520/* create a closure from XS, returns a code reference */
1521/* the arg can be accessed via GENSUB_ARG from the callback */
1522/* the callback must use dXSARGS/XSRETURN */
1523static SV *
1524gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1525{
1526 CV *cv = (CV *)newSV (0);
1527
1528 sv_upgrade ((SV *)cv, SVt_PVCV);
1529
1530 CvANON_on (cv);
1531 CvISXSUB_on (cv);
1532 CvXSUB (cv) = xsub;
1533 GENSUB_ARG = arg;
1534
1535 return newRV_noinc ((SV *)cv);
1536}
1537
1538/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1539 1640
1540INLINE void 1641INLINE void
1541coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1542{ 1643{
1543 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1544}
1545 1645
1546INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1547coro_deq (pTHX) 1654coro_deq (pTHX)
1548{ 1655{
1549 int prio; 1656 int prio;
1550 1657
1551 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1552 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1553 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1554 1669
1555 return 0; 1670 return 0;
1556} 1671}
1557 1672
1558static int 1673static int
… …
1560{ 1675{
1561 struct coro *coro; 1676 struct coro *coro;
1562 SV *sv_hook; 1677 SV *sv_hook;
1563 void (*xs_hook)(void); 1678 void (*xs_hook)(void);
1564 1679
1565 if (SvROK (coro_sv))
1566 coro_sv = SvRV (coro_sv);
1567
1568 coro = SvSTATE (coro_sv); 1680 coro = SvSTATE (coro_sv);
1569 1681
1570 if (coro->flags & CF_READY) 1682 if (coro->flags & CF_READY)
1571 return 0; 1683 return 0;
1572 1684
… …
1603api_is_ready (pTHX_ SV *coro_sv) 1715api_is_ready (pTHX_ SV *coro_sv)
1604{ 1716{
1605 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1717 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1606} 1718}
1607 1719
1720/* expects to own a reference to next->hv */
1608INLINE void 1721INLINE void
1609prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1722prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1610{ 1723{
1611 SV *prev_sv, *next_sv;
1612
1613 for (;;)
1614 {
1615 next_sv = coro_deq (aTHX);
1616
1617 /* nothing to schedule: call the idle handler */
1618 if (expect_false (!next_sv))
1619 {
1620 dSP;
1621
1622 ENTER;
1623 SAVETMPS;
1624
1625 PUSHMARK (SP);
1626 PUTBACK;
1627 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1628
1629 FREETMPS;
1630 LEAVE;
1631 continue;
1632 }
1633
1634 ta->next = SvSTATE_hv (next_sv);
1635
1636 /* cannot transfer to destroyed coros, skip and look for next */
1637 if (expect_false (ta->next->flags & CF_DESTROYED))
1638 {
1639 SvREFCNT_dec (next_sv);
1640 /* coro_nready has already been taken care of by destroy */
1641 continue;
1642 }
1643
1644 --coro_nready;
1645 break;
1646 }
1647
1648 /* free this only after the transfer */
1649 prev_sv = SvRV (coro_current); 1724 SV *prev_sv = SvRV (coro_current);
1725
1650 ta->prev = SvSTATE_hv (prev_sv); 1726 ta->prev = SvSTATE_hv (prev_sv);
1727 ta->next = next;
1728
1651 TRANSFER_CHECK (*ta); 1729 TRANSFER_CHECK (*ta);
1652 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1730
1653 ta->next->flags &= ~CF_READY;
1654 SvRV_set (coro_current, next_sv); 1731 SvRV_set (coro_current, (SV *)next->hv);
1655 1732
1656 free_coro_mortal (aTHX); 1733 free_coro_mortal (aTHX);
1657 coro_mortal = prev_sv; 1734 coro_mortal = prev_sv;
1658} 1735}
1659 1736
1737static void
1738prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1739{
1740 for (;;)
1741 {
1742 struct coro *next = coro_deq (aTHX);
1743
1744 if (expect_true (next))
1745 {
1746 /* cannot transfer to destroyed coros, skip and look for next */
1747 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1748 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1749 else
1750 {
1751 next->flags &= ~CF_READY;
1752 --coro_nready;
1753
1754 prepare_schedule_to (aTHX_ ta, next);
1755 break;
1756 }
1757 }
1758 else
1759 {
1760 /* nothing to schedule: call the idle handler */
1761 if (SvROK (sv_idle)
1762 && SvOBJECT (SvRV (sv_idle)))
1763 {
1764 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1765 api_ready (aTHX_ SvRV (sv_idle));
1766 --coro_nready;
1767 }
1768 else
1769 {
1770 dSP;
1771
1772 ENTER;
1773 SAVETMPS;
1774
1775 PUSHMARK (SP);
1776 PUTBACK;
1777 call_sv (sv_idle, G_VOID | G_DISCARD);
1778
1779 FREETMPS;
1780 LEAVE;
1781 }
1782 }
1783 }
1784}
1785
1660INLINE void 1786INLINE void
1661prepare_cede (pTHX_ struct coro_transfer_args *ta) 1787prepare_cede (pTHX_ struct coro_transfer_args *ta)
1662{ 1788{
1663 api_ready (aTHX_ coro_current); 1789 api_ready (aTHX_ coro_current);
1664 prepare_schedule (aTHX_ ta); 1790 prepare_schedule (aTHX_ ta);
… …
1683{ 1809{
1684 struct coro_transfer_args ta; 1810 struct coro_transfer_args ta;
1685 1811
1686 prepare_schedule (aTHX_ &ta); 1812 prepare_schedule (aTHX_ &ta);
1687 TRANSFER (ta, 1); 1813 TRANSFER (ta, 1);
1814}
1815
1816static void
1817api_schedule_to (pTHX_ SV *coro_sv)
1818{
1819 struct coro_transfer_args ta;
1820 struct coro *next = SvSTATE (coro_sv);
1821
1822 SvREFCNT_inc_NN (coro_sv);
1823 prepare_schedule_to (aTHX_ &ta, next);
1688} 1824}
1689 1825
1690static int 1826static int
1691api_cede (pTHX) 1827api_cede (pTHX)
1692{ 1828{
… …
1721static void 1857static void
1722api_trace (pTHX_ SV *coro_sv, int flags) 1858api_trace (pTHX_ SV *coro_sv, int flags)
1723{ 1859{
1724 struct coro *coro = SvSTATE (coro_sv); 1860 struct coro *coro = SvSTATE (coro_sv);
1725 1861
1862 if (coro->flags & CF_RUNNING)
1863 croak ("cannot enable tracing on a running coroutine, caught");
1864
1726 if (flags & CC_TRACE) 1865 if (flags & CC_TRACE)
1727 { 1866 {
1728 if (!coro->cctx) 1867 if (!coro->cctx)
1729 coro->cctx = cctx_new_run (); 1868 coro->cctx = cctx_new_run ();
1730 else if (!(coro->cctx->flags & CC_TRACE)) 1869 else if (!(coro->cctx->flags & CC_TRACE))
1731 croak ("cannot enable tracing on coroutine with custom stack,"); 1870 croak ("cannot enable tracing on coroutine with custom stack, caught");
1732 1871
1733 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1872 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1734 } 1873 }
1735 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1874 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1736 { 1875 {
… …
1741 else 1880 else
1742 coro->slot->runops = RUNOPS_DEFAULT; 1881 coro->slot->runops = RUNOPS_DEFAULT;
1743 } 1882 }
1744} 1883}
1745 1884
1885static void
1886coro_call_on_destroy (pTHX_ struct coro *coro)
1887{
1888 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1889 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1890
1891 if (on_destroyp)
1892 {
1893 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1894
1895 while (AvFILLp (on_destroy) >= 0)
1896 {
1897 dSP; /* don't disturb outer sp */
1898 SV *cb = av_pop (on_destroy);
1899
1900 PUSHMARK (SP);
1901
1902 if (statusp)
1903 {
1904 int i;
1905 AV *status = (AV *)SvRV (*statusp);
1906 EXTEND (SP, AvFILLp (status) + 1);
1907
1908 for (i = 0; i <= AvFILLp (status); ++i)
1909 PUSHs (AvARRAY (status)[i]);
1910 }
1911
1912 PUTBACK;
1913 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1914 }
1915 }
1916}
1917
1918static void
1919slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1920{
1921 int i;
1922 HV *hv = (HV *)SvRV (coro_current);
1923 AV *av = newAV ();
1924
1925 av_extend (av, items - 1);
1926 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1930
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager);
1933
1934 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat;
1936
1937 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/
1940}
1941
1942/*****************************************************************************/
1943/* async pool handler */
1944
1945static int
1946slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1947{
1948 HV *hv = (HV *)SvRV (coro_current);
1949 struct coro *coro = (struct coro *)frame->data;
1950
1951 if (!coro->invoke_cb)
1952 return 1; /* loop till we have invoke */
1953 else
1954 {
1955 hv_store (hv, "desc", sizeof ("desc") - 1,
1956 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1957
1958 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1959
1960 {
1961 dSP;
1962 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1963 PUTBACK;
1964 }
1965
1966 SvREFCNT_dec (GvAV (PL_defgv));
1967 GvAV (PL_defgv) = coro->invoke_av;
1968 coro->invoke_av = 0;
1969
1970 return 0;
1971 }
1972}
1973
1974static void
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{
1977 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979
1980 if (expect_true (coro->saved_deffh))
1981 {
1982 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0;
1985
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1990 coro->invoke_av = newAV ();
1991
1992 frame->prepare = prepare_nop;
1993 }
1994 else
1995 {
1996 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1998
1999 coro->prio = 0;
2000
2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2002 api_trace (aTHX_ coro_current, 0);
2003
2004 frame->prepare = prepare_schedule;
2005 av_push (av_async_pool, SvREFCNT_inc (hv));
2006 }
2007 }
2008 else
2009 {
2010 /* first iteration, simply fall through */
2011 frame->prepare = prepare_nop;
2012 }
2013
2014 frame->check = slf_check_pool_handler;
2015 frame->data = (void *)coro;
2016}
2017
1746/*****************************************************************************/ 2018/*****************************************************************************/
1747/* rouse callback */ 2019/* rouse callback */
1748 2020
1749#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2021#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1750 2022
1751static void 2023static void
1752coro_rouse_callback (pTHX_ CV *cv) 2024coro_rouse_callback (pTHX_ CV *cv)
1753{ 2025{
1754 dXSARGS; 2026 dXSARGS;
1755 SV *data = (SV *)GENSUB_ARG; 2027 SV *data = (SV *)S_GENSUB_ARG;
1756 2028
1757 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1758 { 2030 {
1759 /* first call, set args */ 2031 /* first call, set args */
1760 int i; 2032 SV *coro = SvRV (data);
1761 AV *av = newAV (); 2033 AV *av = newAV ();
1762 SV *coro = SvRV (data);
1763 2034
1764 SvRV_set (data, (SV *)av); 2035 SvRV_set (data, (SV *)av);
1765 api_ready (aTHX_ coro);
1766 SvREFCNT_dec (coro);
1767 2036
1768 /* better take a full copy of the arguments */ 2037 /* better take a full copy of the arguments */
1769 while (items--) 2038 while (items--)
1770 av_store (av, items, newSVsv (ST (items))); 2039 av_store (av, items, newSVsv (ST (items)));
2040
2041 api_ready (aTHX_ coro);
2042 SvREFCNT_dec (coro);
1771 } 2043 }
1772 2044
1773 XSRETURN_EMPTY; 2045 XSRETURN_EMPTY;
1774} 2046}
1775 2047
… …
1792 2064
1793 EXTEND (SP, AvFILLp (av) + 1); 2065 EXTEND (SP, AvFILLp (av) + 1);
1794 for (i = 0; i <= AvFILLp (av); ++i) 2066 for (i = 0; i <= AvFILLp (av); ++i)
1795 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2067 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1796 2068
1797 /* we have stolen the elements, so ste length to zero and free */ 2069 /* we have stolen the elements, so set length to zero and free */
1798 AvFILLp (av) = -1; 2070 AvFILLp (av) = -1;
1799 av_undef (av); 2071 av_undef (av);
1800 2072
1801 PUTBACK; 2073 PUTBACK;
1802 } 2074 }
… …
1826 || SvTYPE (SvRV (cb)) != SVt_PVCV 2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
1827 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1828 croak ("Coro::rouse_wait called with illegal callback argument,"); 2100 croak ("Coro::rouse_wait called with illegal callback argument,");
1829 2101
1830 { 2102 {
1831 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1832 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
1833 2105
1834 frame->data = (void *)data; 2106 frame->data = (void *)data;
1835 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1836 frame->check = slf_check_rouse_wait; 2108 frame->check = slf_check_rouse_wait;
1837 } 2109 }
… …
1841coro_new_rouse_cb (pTHX) 2113coro_new_rouse_cb (pTHX)
1842{ 2114{
1843 HV *hv = (HV *)SvRV (coro_current); 2115 HV *hv = (HV *)SvRV (coro_current);
1844 struct coro *coro = SvSTATE_hv (hv); 2116 struct coro *coro = SvSTATE_hv (hv);
1845 SV *data = newRV_inc ((SV *)hv); 2117 SV *data = newRV_inc ((SV *)hv);
1846 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1847 2119
1848 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2120 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1849 SvREFCNT_dec (data); /* magicext increases the refcount */ 2121 SvREFCNT_dec (data); /* magicext increases the refcount */
1850 2122
1851 SvREFCNT_dec (coro->rouse_cb); 2123 SvREFCNT_dec (coro->rouse_cb);
… …
1906static void 2178static void
1907slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2179slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1908{ 2180{
1909 frame->prepare = prepare_schedule; 2181 frame->prepare = prepare_schedule;
1910 frame->check = slf_check_nop; 2182 frame->check = slf_check_nop;
2183}
2184
2185static void
2186slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2187{
2188 struct coro *next = (struct coro *)slf_frame.data;
2189
2190 SvREFCNT_inc_NN (next->hv);
2191 prepare_schedule_to (aTHX_ ta, next);
2192}
2193
2194static void
2195slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2196{
2197 if (!items)
2198 croak ("Coro::schedule_to expects a coroutine argument, caught");
2199
2200 frame->data = (void *)SvSTATE (arg [0]);
2201 frame->prepare = slf_prepare_schedule_to;
2202 frame->check = slf_check_nop;
2203}
2204
2205static void
2206slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2207{
2208 api_ready (aTHX_ SvRV (coro_current));
2209
2210 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1911} 2211}
1912 2212
1913static void 2213static void
1914slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2214slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{ 2215{
… …
2061 } 2361 }
2062 else 2362 else
2063 slf_argc = 0; 2363 slf_argc = 0;
2064 2364
2065 PL_op->op_ppaddr = pp_slf; 2365 PL_op->op_ppaddr = pp_slf;
2066 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2366 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2067 2367
2068 PL_op = (OP *)&slf_restore; 2368 PL_op = (OP *)&slf_restore;
2369}
2370
2371/*****************************************************************************/
2372/* dynamic wind */
2373
2374static void
2375on_enterleave_call (pTHX_ SV *cb)
2376{
2377 dSP;
2378
2379 PUSHSTACK;
2380
2381 PUSHMARK (SP);
2382 PUTBACK;
2383 call_sv (cb, G_VOID | G_DISCARD);
2384 SPAGAIN;
2385
2386 POPSTACK;
2387}
2388
2389static SV *
2390coro_avp_pop_and_free (pTHX_ AV **avp)
2391{
2392 AV *av = *avp;
2393 SV *res = av_pop (av);
2394
2395 if (AvFILLp (av) < 0)
2396 {
2397 *avp = 0;
2398 SvREFCNT_dec (av);
2399 }
2400
2401 return res;
2402}
2403
2404static void
2405coro_pop_on_enter (pTHX_ void *coro)
2406{
2407 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2408 SvREFCNT_dec (cb);
2409}
2410
2411static void
2412coro_pop_on_leave (pTHX_ void *coro)
2413{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb));
2069} 2416}
2070 2417
2071/*****************************************************************************/ 2418/*****************************************************************************/
2072/* PerlIO::cede */ 2419/* PerlIO::cede */
2073 2420
… …
2147/* Coro::Semaphore & Coro::Signal */ 2494/* Coro::Semaphore & Coro::Signal */
2148 2495
2149static SV * 2496static SV *
2150coro_waitarray_new (pTHX_ int count) 2497coro_waitarray_new (pTHX_ int count)
2151{ 2498{
2152 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2499 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2153 AV *av = newAV (); 2500 AV *av = newAV ();
2154 SV **ary; 2501 SV **ary;
2155 2502
2156 /* unfortunately, building manually saves memory */ 2503 /* unfortunately, building manually saves memory */
2157 Newx (ary, 2, SV *); 2504 Newx (ary, 2, SV *);
2158 AvALLOC (av) = ary; 2505 AvALLOC (av) = ary;
2506#if PERL_VERSION_ATLEAST (5,10,0)
2159 /*AvARRAY (av) = ary;*/ 2507 AvARRAY (av) = ary;
2508#else
2160 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2509 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2510 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2511 SvPVX ((SV *)av) = (char *)ary;
2512#endif
2161 AvMAX (av) = 1; 2513 AvMAX (av) = 1;
2162 AvFILLp (av) = 0; 2514 AvFILLp (av) = 0;
2163 ary [0] = newSViv (count); 2515 ary [0] = newSViv (count);
2164 2516
2165 return newRV_noinc ((SV *)av); 2517 return newRV_noinc ((SV *)av);
… …
2294{ 2646{
2295 if (items >= 2) 2647 if (items >= 2)
2296 { 2648 {
2297 /* callback form */ 2649 /* callback form */
2298 AV *av = (AV *)SvRV (arg [0]); 2650 AV *av = (AV *)SvRV (arg [0]);
2299 CV *cb_cv = coro_sv_2cv (arg [1]); 2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2300 2652
2301 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2302 2654
2303 if (SvIVX (AvARRAY (av)[0]) > 0) 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2304 coro_semaphore_adjust (aTHX_ av, 0); 2656 coro_semaphore_adjust (aTHX_ av, 0);
2305 2657
2306 frame->prepare = prepare_nop; 2658 frame->prepare = prepare_nop;
… …
2330 AvARRAY (av)[0] = AvARRAY (av)[1]; 2682 AvARRAY (av)[0] = AvARRAY (av)[1];
2331 AvARRAY (av)[1] = cb; 2683 AvARRAY (av)[1] = cb;
2332 2684
2333 cb = av_shift (av); 2685 cb = av_shift (av);
2334 2686
2687 if (SvTYPE (cb) == SVt_PVCV)
2688 {
2689 dSP;
2690 PUSHMARK (SP);
2691 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2692 PUTBACK;
2693 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2694 }
2695 else
2696 {
2335 api_ready (aTHX_ cb); 2697 api_ready (aTHX_ cb);
2336 sv_setiv (cb, 0); /* signal waiter */ 2698 sv_setiv (cb, 0); /* signal waiter */
2699 }
2700
2337 SvREFCNT_dec (cb); 2701 SvREFCNT_dec (cb);
2338 2702
2339 --count; 2703 --count;
2340 } 2704 }
2341} 2705}
… …
2350static void 2714static void
2351slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2715slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2352{ 2716{
2353 AV *av = (AV *)SvRV (arg [0]); 2717 AV *av = (AV *)SvRV (arg [0]);
2354 2718
2719 if (items >= 2)
2720 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723
2355 if (SvIVX (AvARRAY (av)[0])) 2724 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2726
2727 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop;
2729 }
2730 else if (SvIVX (AvARRAY (av)[0]))
2356 { 2731 {
2357 SvIVX (AvARRAY (av)[0]) = 0; 2732 SvIVX (AvARRAY (av)[0]) = 0;
2358 frame->prepare = prepare_nop; 2733 frame->prepare = prepare_nop;
2359 frame->check = slf_check_nop; 2734 frame->check = slf_check_nop;
2360 } 2735 }
2361 else 2736 else
2362 { 2737 {
2363 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2738 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2364 2739
2365 av_push (av, waiter); 2740 av_push (av, waiter);
2366 2741
2367 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2742 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2368 frame->prepare = prepare_schedule; 2743 frame->prepare = prepare_schedule;
… …
2386 2761
2387static void 2762static void
2388coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2389{ 2764{
2390 dXSARGS; 2765 dXSARGS;
2391 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2392 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2393 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2394 2769
2395 av_extend (state, items); 2770 av_extend (state, items - 1);
2396 2771
2397 sv_upgrade (data_sv, SVt_PV); 2772 sv_upgrade (data_sv, SVt_PV);
2398 SvCUR_set (data_sv, sizeof (struct io_state)); 2773 SvCUR_set (data_sv, sizeof (struct io_state));
2399 SvPOK_only (data_sv); 2774 SvPOK_only (data_sv);
2400 2775
… …
2510 2885
2511 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2512 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2513 2888
2514 /* now push the callback closure */ 2889 /* now push the callback closure */
2515 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2890 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2516 2891
2517 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2518 PUTBACK; 2893 PUTBACK;
2519 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2520 } 2895 }
… …
2534 2909
2535 XSRETURN_EMPTY; 2910 XSRETURN_EMPTY;
2536} 2911}
2537 2912
2538/*****************************************************************************/ 2913/*****************************************************************************/
2914
2915#if CORO_CLONE
2916# include "clone.c"
2917#endif
2539 2918
2540MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2919MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2541 2920
2542PROTOTYPES: DISABLE 2921PROTOTYPES: DISABLE
2543 2922
… …
2548 coro_thx = PERL_GET_CONTEXT; 2927 coro_thx = PERL_GET_CONTEXT;
2549# endif 2928# endif
2550#endif 2929#endif
2551 BOOT_PAGESIZE; 2930 BOOT_PAGESIZE;
2552 2931
2932 cctx_current = cctx_new_empty ();
2933
2553 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2934 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2554 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2935 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2555 2936
2556 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2937 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2557 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2938 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2576 2957
2577 { 2958 {
2578 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2959 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2579 2960
2580 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2961 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2581 hv_store_ent (PL_custom_op_names, slf, 2962 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2582 newSVpv ("coro_slf", 0), 0);
2583 2963
2584 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2964 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2585 hv_store_ent (PL_custom_op_descs, slf, 2965 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2586 newSVpv ("coro schedule like function", 0), 0);
2587 } 2966 }
2588 2967
2589 coroapi.ver = CORO_API_VERSION; 2968 coroapi.ver = CORO_API_VERSION;
2590 coroapi.rev = CORO_API_REVISION; 2969 coroapi.rev = CORO_API_REVISION;
2591 2970
… …
2603 2982
2604 if (!svp) croak ("Time::HiRes is required"); 2983 if (!svp) croak ("Time::HiRes is required");
2605 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2984 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2606 2985
2607 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2986 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2987
2988 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2989 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2608 } 2990 }
2609 2991
2610 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2992 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2611} 2993}
2612 2994
2613SV * 2995SV *
2614new (char *klass, ...) 2996new (char *klass, ...)
2997 ALIAS:
2998 Coro::new = 1
2615 CODE: 2999 CODE:
2616{ 3000{
2617 struct coro *coro; 3001 struct coro *coro;
2618 MAGIC *mg; 3002 MAGIC *mg;
2619 HV *hv; 3003 HV *hv;
2620 CV *cb; 3004 SV *cb;
2621 int i; 3005 int i;
2622 3006
2623 if (items > 1) 3007 if (items > 1)
2624 { 3008 {
2625 cb = coro_sv_2cv (ST (1)); 3009 cb = s_get_cv_croak (ST (1));
2626 3010
3011 if (!ix)
3012 {
2627 if (CvISXSUB (cb)) 3013 if (CvISXSUB (cb))
2628 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 3014 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2629 3015
2630 if (!CvROOT (cb)) 3016 if (!CvROOT (cb))
2631 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught"); 3017 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3018 }
2632 } 3019 }
2633 3020
2634 Newz (0, coro, 1, struct coro); 3021 Newz (0, coro, 1, struct coro);
2635 coro->args = newAV (); 3022 coro->args = newAV ();
2636 coro->flags = CF_NEW; 3023 coro->flags = CF_NEW;
… …
2644 mg->mg_flags |= MGf_DUP; 3031 mg->mg_flags |= MGf_DUP;
2645 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3032 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2646 3033
2647 if (items > 1) 3034 if (items > 1)
2648 { 3035 {
2649 coro->startcv = SvREFCNT_inc_NN (cb);
2650
2651 av_extend (coro->args, items - 1); 3036 av_extend (coro->args, items - 1 + ix - 1);
3037
3038 if (ix)
3039 {
2652 av_push (coro->args, SvREFCNT_inc (cb)); 3040 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3041 cb = (SV *)cv_coro_run;
3042 }
3043
3044 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3045
2653 for (i = 2; i < items; i++) 3046 for (i = 2; i < items; i++)
2654 av_push (coro->args, newSVsv (ST (i))); 3047 av_push (coro->args, newSVsv (ST (i)));
2655 } 3048 }
2656} 3049}
2657 OUTPUT: 3050 OUTPUT:
… …
2673void 3066void
2674_exit (int code) 3067_exit (int code)
2675 PROTOTYPE: $ 3068 PROTOTYPE: $
2676 CODE: 3069 CODE:
2677 _exit (code); 3070 _exit (code);
3071
3072SV *
3073clone (Coro::State coro)
3074 CODE:
3075{
3076#if CORO_CLONE
3077 struct coro *ncoro = coro_clone (aTHX_ coro);
3078 MAGIC *mg;
3079 /* TODO: too much duplication */
3080 ncoro->hv = newHV ();
3081 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3082 mg->mg_flags |= MGf_DUP;
3083 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3084#else
3085 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3086#endif
3087}
3088 OUTPUT:
3089 RETVAL
2678 3090
2679int 3091int
2680cctx_stacksize (int new_stacksize = 0) 3092cctx_stacksize (int new_stacksize = 0)
2681 PROTOTYPE: ;$ 3093 PROTOTYPE: ;$
2682 CODE: 3094 CODE:
… …
2732 eval = 1 3144 eval = 1
2733 CODE: 3145 CODE:
2734{ 3146{
2735 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3147 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2736 { 3148 {
2737 struct coro temp; 3149 struct coro *current = SvSTATE_current;
2738 3150
2739 if (!(coro->flags & CF_RUNNING)) 3151 if (current != coro)
2740 { 3152 {
2741 PUTBACK; 3153 PUTBACK;
2742 save_perl (aTHX_ &temp); 3154 save_perl (aTHX_ current);
2743 load_perl (aTHX_ coro); 3155 load_perl (aTHX_ coro);
3156 SPAGAIN;
2744 } 3157 }
2745 3158
2746 {
2747 dSP;
2748 ENTER;
2749 SAVETMPS;
2750 PUTBACK;
2751 PUSHSTACK; 3159 PUSHSTACK;
3160
2752 PUSHMARK (SP); 3161 PUSHMARK (SP);
3162 PUTBACK;
2753 3163
2754 if (ix) 3164 if (ix)
2755 eval_sv (coderef, 0); 3165 eval_sv (coderef, 0);
2756 else 3166 else
2757 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3167 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2758 3168
2759 POPSTACK; 3169 POPSTACK;
2760 SPAGAIN; 3170 SPAGAIN;
2761 FREETMPS;
2762 LEAVE;
2763 PUTBACK;
2764 }
2765 3171
2766 if (!(coro->flags & CF_RUNNING)) 3172 if (current != coro)
2767 { 3173 {
3174 PUTBACK;
2768 save_perl (aTHX_ coro); 3175 save_perl (aTHX_ coro);
2769 load_perl (aTHX_ &temp); 3176 load_perl (aTHX_ current);
2770 SPAGAIN; 3177 SPAGAIN;
2771 } 3178 }
2772 } 3179 }
2773} 3180}
2774 3181
… …
2778 ALIAS: 3185 ALIAS:
2779 is_ready = CF_READY 3186 is_ready = CF_READY
2780 is_running = CF_RUNNING 3187 is_running = CF_RUNNING
2781 is_new = CF_NEW 3188 is_new = CF_NEW
2782 is_destroyed = CF_DESTROYED 3189 is_destroyed = CF_DESTROYED
3190 is_suspended = CF_SUSPENDED
2783 CODE: 3191 CODE:
2784 RETVAL = boolSV (coro->flags & ix); 3192 RETVAL = boolSV (coro->flags & ix);
2785 OUTPUT: 3193 OUTPUT:
2786 RETVAL 3194 RETVAL
2787 3195
… …
2791 CODE: 3199 CODE:
2792{ 3200{
2793 struct coro *current = SvSTATE_current; 3201 struct coro *current = SvSTATE_current;
2794 SV **throwp = self == current ? &CORO_THROW : &self->except; 3202 SV **throwp = self == current ? &CORO_THROW : &self->except;
2795 SvREFCNT_dec (*throwp); 3203 SvREFCNT_dec (*throwp);
3204 SvGETMAGIC (throw);
2796 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3205 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2797} 3206}
2798 3207
2799void 3208void
2800api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3209api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2803 3212
2804SV * 3213SV *
2805has_cctx (Coro::State coro) 3214has_cctx (Coro::State coro)
2806 PROTOTYPE: $ 3215 PROTOTYPE: $
2807 CODE: 3216 CODE:
2808 RETVAL = boolSV (!!coro->cctx); 3217 /* maybe manage the running flag differently */
3218 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2809 OUTPUT: 3219 OUTPUT:
2810 RETVAL 3220 RETVAL
2811 3221
2812int 3222int
2813is_traced (Coro::State coro) 3223is_traced (Coro::State coro)
… …
2833 3243
2834void 3244void
2835force_cctx () 3245force_cctx ()
2836 PROTOTYPE: 3246 PROTOTYPE:
2837 CODE: 3247 CODE:
2838 SvSTATE_current->cctx->idle_sp = 0; 3248 cctx_current->idle_sp = 0;
2839 3249
2840void 3250void
2841swap_defsv (Coro::State self) 3251swap_defsv (Coro::State self)
2842 PROTOTYPE: $ 3252 PROTOTYPE: $
2843 ALIAS: 3253 ALIAS:
… …
2851 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3261 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2852 3262
2853 SV *tmp = *src; *src = *dst; *dst = tmp; 3263 SV *tmp = *src; *src = *dst; *dst = tmp;
2854 } 3264 }
2855 3265
3266void
3267cancel (Coro::State self)
3268 CODE:
3269 coro_state_destroy (aTHX_ self);
3270 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3271
3272
3273SV *
3274enable_times (int enabled = enable_times)
3275 CODE:
3276{
3277 RETVAL = boolSV (enable_times);
3278
3279 if (enabled != enable_times)
3280 {
3281 enable_times = enabled;
3282
3283 coro_times_update ();
3284 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3285 }
3286}
3287 OUTPUT:
3288 RETVAL
3289
3290void
3291times (Coro::State self)
3292 PPCODE:
3293{
3294 struct coro *current = SvSTATE (coro_current);
3295
3296 if (expect_false (current == self))
3297 {
3298 coro_times_update ();
3299 coro_times_add (SvSTATE (coro_current));
3300 }
3301
3302 EXTEND (SP, 2);
3303 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3304 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3305
3306 if (expect_false (current == self))
3307 coro_times_sub (SvSTATE (coro_current));
3308}
2856 3309
2857MODULE = Coro::State PACKAGE = Coro 3310MODULE = Coro::State PACKAGE = Coro
2858 3311
2859BOOT: 3312BOOT:
2860{ 3313{
2861 int i;
2862
2863 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2864 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3314 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2865 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3315 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2866 3316 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3317 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2867 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3318 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2868 SvREADONLY_on (coro_current); 3319 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3320 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3321 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3322 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3323
3324 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3325 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3326 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3327 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2869 3328
2870 coro_stash = gv_stashpv ("Coro", TRUE); 3329 coro_stash = gv_stashpv ("Coro", TRUE);
2871 3330
2872 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3331 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2873 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3332 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2874 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3333 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2875 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3334 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2876 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3335 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2877 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3336 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2878
2879 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2880 coro_ready[i] = newAV ();
2881 3337
2882 { 3338 {
2883 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3339 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2884 3340
2885 coroapi.schedule = api_schedule; 3341 coroapi.schedule = api_schedule;
3342 coroapi.schedule_to = api_schedule_to;
2886 coroapi.cede = api_cede; 3343 coroapi.cede = api_cede;
2887 coroapi.cede_notself = api_cede_notself; 3344 coroapi.cede_notself = api_cede_notself;
2888 coroapi.ready = api_ready; 3345 coroapi.ready = api_ready;
2889 coroapi.is_ready = api_is_ready; 3346 coroapi.is_ready = api_is_ready;
2890 coroapi.nready = coro_nready; 3347 coroapi.nready = coro_nready;
… …
2895 SvREADONLY_on (sv); 3352 SvREADONLY_on (sv);
2896 } 3353 }
2897} 3354}
2898 3355
2899void 3356void
3357terminate (...)
3358 CODE:
3359 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3360
3361void
2900schedule (...) 3362schedule (...)
2901 CODE: 3363 CODE:
2902 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3364 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3365
3366void
3367schedule_to (...)
3368 CODE:
3369 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3370
3371void
3372cede_to (...)
3373 CODE:
3374 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2903 3375
2904void 3376void
2905cede (...) 3377cede (...)
2906 CODE: 3378 CODE:
2907 CORO_EXECUTE_SLF_XS (slf_init_cede); 3379 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2921void 3393void
2922_set_readyhook (SV *hook) 3394_set_readyhook (SV *hook)
2923 PROTOTYPE: $ 3395 PROTOTYPE: $
2924 CODE: 3396 CODE:
2925 SvREFCNT_dec (coro_readyhook); 3397 SvREFCNT_dec (coro_readyhook);
3398 SvGETMAGIC (hook);
2926 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3399 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2927 3400
2928int 3401int
2929prio (Coro::State coro, int newprio = 0) 3402prio (Coro::State coro, int newprio = 0)
2930 PROTOTYPE: $;$ 3403 PROTOTYPE: $;$
… …
2937 if (items > 1) 3410 if (items > 1)
2938 { 3411 {
2939 if (ix) 3412 if (ix)
2940 newprio = coro->prio - newprio; 3413 newprio = coro->prio - newprio;
2941 3414
2942 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3415 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2943 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3416 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2944 3417
2945 coro->prio = newprio; 3418 coro->prio = newprio;
2946 } 3419 }
2947} 3420}
2948 OUTPUT: 3421 OUTPUT:
… …
2962 CODE: 3435 CODE:
2963 RETVAL = coro_nready; 3436 RETVAL = coro_nready;
2964 OUTPUT: 3437 OUTPUT:
2965 RETVAL 3438 RETVAL
2966 3439
2967# for async_pool speedup
2968void 3440void
2969_pool_1 (SV *cb) 3441suspend (Coro::State self)
3442 PROTOTYPE: $
2970 CODE: 3443 CODE:
2971{ 3444 self->flags |= CF_SUSPENDED;
2972 HV *hv = (HV *)SvRV (coro_current);
2973 struct coro *coro = SvSTATE_hv ((SV *)hv);
2974 AV *defav = GvAV (PL_defgv);
2975 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2976 AV *invoke_av;
2977 int i, len;
2978 3445
2979 if (!invoke) 3446void
3447resume (Coro::State self)
3448 PROTOTYPE: $
3449 CODE:
3450 self->flags &= ~CF_SUSPENDED;
3451
3452void
3453_pool_handler (...)
3454 CODE:
3455 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3456
3457void
3458async_pool (SV *cv, ...)
3459 PROTOTYPE: &@
3460 PPCODE:
3461{
3462 HV *hv = (HV *)av_pop (av_async_pool);
3463 AV *av = newAV ();
3464 SV *cb = ST (0);
3465 int i;
3466
3467 av_extend (av, items - 2);
3468 for (i = 1; i < items; ++i)
3469 av_push (av, SvREFCNT_inc_NN (ST (i)));
3470
3471 if ((SV *)hv == &PL_sv_undef)
2980 { 3472 {
2981 SV *old = PL_diehook; 3473 PUSHMARK (SP);
2982 PL_diehook = 0; 3474 EXTEND (SP, 2);
2983 SvREFCNT_dec (old); 3475 PUSHs (sv_Coro);
2984 croak ("\3async_pool terminate\2\n"); 3476 PUSHs ((SV *)cv_pool_handler);
3477 PUTBACK;
3478 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3479 SPAGAIN;
3480
3481 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2985 } 3482 }
2986 3483
2987 SvREFCNT_dec (coro->saved_deffh);
2988 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2989
2990 hv_store (hv, "desc", sizeof ("desc") - 1,
2991 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2992
2993 invoke_av = (AV *)SvRV (invoke);
2994 len = av_len (invoke_av);
2995
2996 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2997
2998 if (len > 0)
2999 { 3484 {
3000 av_fill (defav, len - 1); 3485 struct coro *coro = SvSTATE_hv (hv);
3001 for (i = 0; i < len; ++i) 3486
3002 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3487 assert (!coro->invoke_cb);
3488 assert (!coro->invoke_av);
3489 coro->invoke_cb = SvREFCNT_inc (cb);
3490 coro->invoke_av = av;
3003 } 3491 }
3004}
3005 3492
3006void 3493 api_ready (aTHX_ (SV *)hv);
3007_pool_2 (SV *cb)
3008 CODE:
3009{
3010 HV *hv = (HV *)SvRV (coro_current);
3011 struct coro *coro = SvSTATE_hv ((SV *)hv);
3012 3494
3013 sv_setsv (cb, &PL_sv_undef); 3495 if (GIMME_V != G_VOID)
3014 3496 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3015 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3497 else
3016 coro->saved_deffh = 0;
3017
3018 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
3019 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
3020 {
3021 SV *old = PL_diehook;
3022 PL_diehook = 0;
3023 SvREFCNT_dec (old); 3498 SvREFCNT_dec (hv);
3024 croak ("\3async_pool terminate\2\n");
3025 }
3026
3027 av_clear (GvAV (PL_defgv));
3028 hv_store (hv, "desc", sizeof ("desc") - 1,
3029 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
3030
3031 coro->prio = 0;
3032
3033 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
3034 api_trace (aTHX_ coro_current, 0);
3035
3036 av_push (av_async_pool, newSVsv (coro_current));
3037} 3499}
3038 3500
3039SV * 3501SV *
3040rouse_cb () 3502rouse_cb ()
3041 PROTOTYPE: 3503 PROTOTYPE:
… …
3048rouse_wait (...) 3510rouse_wait (...)
3049 PROTOTYPE: ;$ 3511 PROTOTYPE: ;$
3050 PPCODE: 3512 PPCODE:
3051 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3513 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3052 3514
3515void
3516on_enter (SV *block)
3517 ALIAS:
3518 on_leave = 1
3519 PROTOTYPE: &
3520 CODE:
3521{
3522 struct coro *coro = SvSTATE_current;
3523 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3524
3525 block = s_get_cv_croak (block);
3526
3527 if (!*avp)
3528 *avp = newAV ();
3529
3530 av_push (*avp, SvREFCNT_inc (block));
3531
3532 if (!ix)
3533 on_enterleave_call (aTHX_ block);
3534
3535 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3536 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3537 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3538}
3539
3053 3540
3054MODULE = Coro::State PACKAGE = PerlIO::cede 3541MODULE = Coro::State PACKAGE = PerlIO::cede
3055 3542
3056BOOT: 3543BOOT:
3057 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3544 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3060MODULE = Coro::State PACKAGE = Coro::Semaphore 3547MODULE = Coro::State PACKAGE = Coro::Semaphore
3061 3548
3062SV * 3549SV *
3063new (SV *klass, SV *count = 0) 3550new (SV *klass, SV *count = 0)
3064 CODE: 3551 CODE:
3552{
3553 int semcnt = 1;
3554
3555 if (count)
3556 {
3557 SvGETMAGIC (count);
3558
3559 if (SvOK (count))
3560 semcnt = SvIV (count);
3561 }
3562
3065 RETVAL = sv_bless ( 3563 RETVAL = sv_bless (
3066 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3564 coro_waitarray_new (aTHX_ semcnt),
3067 GvSTASH (CvGV (cv)) 3565 GvSTASH (CvGV (cv))
3068 ); 3566 );
3567}
3069 OUTPUT: 3568 OUTPUT:
3070 RETVAL 3569 RETVAL
3071 3570
3072# helper for Coro::Channel 3571# helper for Coro::Channel and others
3073SV * 3572SV *
3074_alloc (int count) 3573_alloc (int count)
3075 CODE: 3574 CODE:
3076 RETVAL = coro_waitarray_new (aTHX_ count); 3575 RETVAL = coro_waitarray_new (aTHX_ count);
3077 OUTPUT: 3576 OUTPUT:
… …
3135 for (i = 1; i <= wcount; ++i) 3634 for (i = 1; i <= wcount; ++i)
3136 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3635 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3137 } 3636 }
3138} 3637}
3139 3638
3639MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3640
3641void
3642_may_delete (SV *sem, int count, int extra_refs)
3643 PPCODE:
3644{
3645 AV *av = (AV *)SvRV (sem);
3646
3647 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3648 && AvFILLp (av) == 0 /* no waiters, just count */
3649 && SvIV (AvARRAY (av)[0]) == count)
3650 XSRETURN_YES;
3651
3652 XSRETURN_NO;
3653}
3654
3140MODULE = Coro::State PACKAGE = Coro::Signal 3655MODULE = Coro::State PACKAGE = Coro::Signal
3141 3656
3142SV * 3657SV *
3143new (SV *klass) 3658new (SV *klass)
3144 CODE: 3659 CODE:
… …
3215 3730
3216void 3731void
3217_register (char *target, char *proto, SV *req) 3732_register (char *target, char *proto, SV *req)
3218 CODE: 3733 CODE:
3219{ 3734{
3220 CV *req_cv = coro_sv_2cv (req); 3735 SV *req_cv = s_get_cv_croak (req);
3221 /* newXSproto doesn't return the CV on 5.8 */ 3736 /* newXSproto doesn't return the CV on 5.8 */
3222 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3737 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3223 sv_setpv ((SV *)slf_cv, proto); 3738 sv_setpv ((SV *)slf_cv, proto);
3224 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3739 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3225} 3740}
3226 3741
3742MODULE = Coro::State PACKAGE = Coro::Select
3743
3744void
3745patch_pp_sselect ()
3746 CODE:
3747 if (!coro_old_pp_sselect)
3748 {
3749 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3750 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3751 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3752 }
3753
3754void
3755unpatch_pp_sselect ()
3756 CODE:
3757 if (coro_old_pp_sselect)
3758 {
3759 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3760 coro_old_pp_sselect = 0;
3761 }
3762
3763

Diff Legend

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