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.304 by root, Wed Nov 19 08:22:48 2008 UTC vs.
Revision 1.361 by root, Wed Jul 1 07:26:40 2009 UTC

… …
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c))))) 60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61 61
62#if !PERL_VERSION_ATLEAST (5,6,0) 62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr 63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr 64# define PL_ppaddr ppaddr
65# endif 65# endif
… …
98# define newSV(l) NEWSV(0,l) 98# define newSV(l) NEWSV(0,l)
99#endif 99#endif
100#ifndef CvISXSUB_on 100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv 101# define CvISXSUB_on(cv) (void)cv
102#endif 102#endif
103#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
103 109
104/* 5.8.7 */ 110/* 5.8.7 */
105#ifndef SvRV_set 111#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v) 112# define SvRV_set(s,v) SvRV(s) = (v)
107#endif 113#endif
… …
127#else 133#else
128# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
130#endif 136#endif
131 137
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
133 139
134#if __GNUC__ >= 3 140#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 143# define INLINE static inline
138#else 144#else
139# define attribute(x) 145# define attribute(x)
140# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
141# define INLINE static 147# define INLINE static
… …
153# if CORO_PTHREAD 159# if CORO_PTHREAD
154static void *coro_thx; 160static void *coro_thx;
155# endif 161# endif
156#endif 162#endif
157 163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
171# endif
172#endif
173
158static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
175static void (*u2time)(pTHX_ UV ret[2]);
159 176
160/* we hijack an hopefully unused CV flag for our purposes */ 177/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 178#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 179static OP *pp_slf (pTHX);
163 180
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 184static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 185static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 186static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 187static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 188
189static AV *av_destroy; /* destruction queue */
190static SV *sv_manager; /* the manager coro */
191static SV *sv_idle; /* $Coro::idle */
192
172static GV *irsgv; /* $/ */ 193static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 194static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 195static SV *rv_diehook;
175static SV *rv_warnhook; 196static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 197static HV *hv_sig; /* %SIG */
177 198
178/* async_pool helper stuff */ 199/* async_pool helper stuff */
179static SV *sv_pool_rss; 200static SV *sv_pool_rss;
180static SV *sv_pool_size; 201static SV *sv_pool_size;
202static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 203static AV *av_async_pool; /* idle pool */
204static SV *sv_Coro; /* class string */
205static CV *cv_pool_handler;
206static CV *cv_coro_state_new;
182 207
183/* Coro::AnyEvent */ 208/* Coro::AnyEvent */
184static SV *sv_activity; 209static SV *sv_activity;
210
211/* enable processtime/realtime profiling */
212static char enable_times;
213typedef U32 coro_ts[2];
214static coro_ts time_real, time_cpu;
215static char times_valid;
185 216
186static struct coro_cctx *cctx_first; 217static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 218static int cctx_count, cctx_idle;
188 219
189enum { 220enum {
… …
215 int valgrind_id; 246 int valgrind_id;
216#endif 247#endif
217 unsigned char flags; 248 unsigned char flags;
218} coro_cctx; 249} coro_cctx;
219 250
251coro_cctx *cctx_current; /* the currently running cctx */
252
253/*****************************************************************************/
254
220enum { 255enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 256 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 257 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 258 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 259 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
260 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 261};
226 262
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 263/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 264typedef struct
229{ 265{
230 SV *defsv; 266 SV *defsv;
231 AV *defav; 267 AV *defav;
232 SV *errsv; 268 SV *errsv;
233 SV *irsgv; 269 SV *irsgv;
270 HV *hinthv;
234#define VAR(name,type) type name; 271#define VAR(name,type) type name;
235# include "state.h" 272# include "state.h"
236#undef VAR 273#undef VAR
237} perl_slots; 274} perl_slots;
238 275
… …
241/* this is a structure representing a perl-level coroutine */ 278/* this is a structure representing a perl-level coroutine */
242struct coro { 279struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 280 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 281 coro_cctx *cctx;
245 282
283 /* ready queue */
284 struct coro *next_ready;
285
246 /* state data */ 286 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 287 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 288 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 289 perl_slots *slot; /* basically the saved sp */
250 290
291 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 292 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 293 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 294 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 295 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 296 void (*on_destroy)(pTHX_ struct coro *coro);
256 297
257 /* statistics */ 298 /* statistics */
258 int usecount; /* number of transfers to this coro */ 299 int usecount; /* number of transfers to this coro */
259 300
… …
262 SV *except; /* exception to be thrown */ 303 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 304 SV *rouse_cb;
264 305
265 /* async_pool */ 306 /* async_pool */
266 SV *saved_deffh; 307 SV *saved_deffh;
308 SV *invoke_cb;
309 AV *invoke_av;
310
311 /* on_enter/on_leave */
312 AV *on_enter;
313 AV *on_leave;
314
315 /* times */
316 coro_ts t_cpu, t_real;
267 317
268 /* linked list */ 318 /* linked list */
269 struct coro *next, *prev; 319 struct coro *next, *prev;
270}; 320};
271 321
… …
277/* the mainr easonw e don't support windows process emulation */ 327/* the mainr easonw e don't support windows process emulation */
278static struct CoroSLF slf_frame; /* the current slf frame */ 328static struct CoroSLF slf_frame; /* the current slf frame */
279 329
280/** Coro ********************************************************************/ 330/** Coro ********************************************************************/
281 331
282#define PRIO_MAX 3 332#define CORO_PRIO_MAX 3
283#define PRIO_HIGH 1 333#define CORO_PRIO_HIGH 1
284#define PRIO_NORMAL 0 334#define CORO_PRIO_NORMAL 0
285#define PRIO_LOW -1 335#define CORO_PRIO_LOW -1
286#define PRIO_IDLE -3 336#define CORO_PRIO_IDLE -3
287#define PRIO_MIN -4 337#define CORO_PRIO_MIN -4
288 338
289/* for Coro.pm */ 339/* for Coro.pm */
290static SV *coro_current; 340static SV *coro_current;
291static SV *coro_readyhook; 341static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 342static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
343static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 344static struct coro *coro_first;
294#define coro_nready coroapi.nready 345#define coro_nready coroapi.nready
295 346
296/** lowlevel stuff **********************************************************/ 347/** lowlevel stuff **********************************************************/
297 348
… …
323 get_hv (name, create); 374 get_hv (name, create);
324#endif 375#endif
325 return get_hv (name, create); 376 return get_hv (name, create);
326} 377}
327 378
379/* may croak */
380INLINE CV *
381coro_sv_2cv (pTHX_ SV *sv)
382{
383 HV *st;
384 GV *gvp;
385 CV *cv = sv_2cv (sv, &st, &gvp, 0);
386
387 if (!cv)
388 croak ("code reference expected");
389
390 return cv;
391}
392
393INLINE void
394coro_times_update ()
395{
396#ifdef coro_clock_gettime
397 struct timespec ts;
398
399 ts.tv_sec = ts.tv_nsec = 0;
400 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
401 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
402
403 ts.tv_sec = ts.tv_nsec = 0;
404 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
405 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
406#else
407 dTHX;
408 UV tv[2];
409
410 u2time (aTHX_ &tv);
411 time_real [0] = tv [0];
412 time_real [1] = tv [1] * 1000;
413#endif
414}
415
416INLINE void
417coro_times_add (struct coro *c)
418{
419 c->t_real [1] += time_real [1];
420 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
421 c->t_real [0] += time_real [0];
422
423 c->t_cpu [1] += time_cpu [1];
424 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
425 c->t_cpu [0] += time_cpu [0];
426}
427
428INLINE void
429coro_times_sub (struct coro *c)
430{
431 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
432 c->t_real [1] -= time_real [1];
433 c->t_real [0] -= time_real [0];
434
435 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
436 c->t_cpu [1] -= time_cpu [1];
437 c->t_cpu [0] -= time_cpu [0];
438}
439
440/*****************************************************************************/
441/* magic glue */
442
443#define CORO_MAGIC_type_cv 26
444#define CORO_MAGIC_type_state PERL_MAGIC_ext
445
446#define CORO_MAGIC_NN(sv, type) \
447 (expect_true (SvMAGIC (sv)->mg_type == type) \
448 ? SvMAGIC (sv) \
449 : mg_find (sv, type))
450
451#define CORO_MAGIC(sv, type) \
452 (expect_true (SvMAGIC (sv)) \
453 ? CORO_MAGIC_NN (sv, type) \
454 : 0)
455
456#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
457#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
458
459INLINE struct coro *
460SvSTATE_ (pTHX_ SV *coro)
461{
462 HV *stash;
463 MAGIC *mg;
464
465 if (SvROK (coro))
466 coro = SvRV (coro);
467
468 if (expect_false (SvTYPE (coro) != SVt_PVHV))
469 croak ("Coro::State object required");
470
471 stash = SvSTASH (coro);
472 if (expect_false (stash != coro_stash && stash != coro_state_stash))
473 {
474 /* very slow, but rare, check */
475 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
476 croak ("Coro::State object required");
477 }
478
479 mg = CORO_MAGIC_state (coro);
480 return (struct coro *)mg->mg_ptr;
481}
482
483#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
484
485/* faster than SvSTATE, but expects a coroutine hv */
486#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
487#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
488
489/*****************************************************************************/
490/* padlist management and caching */
491
328static AV * 492static AV *
329coro_clone_padlist (pTHX_ CV *cv) 493coro_derive_padlist (pTHX_ CV *cv)
330{ 494{
331 AV *padlist = CvPADLIST (cv); 495 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 496 AV *newpadlist, *newpad;
333 497
334 newpadlist = newAV (); 498 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 503 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 504#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 505 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 506 --AvFILLp (padlist);
343 507
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 508 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 509 av_store (newpadlist, 1, (SV *)newpad);
346 510
347 return newpadlist; 511 return newpadlist;
348} 512}
349 513
350static void 514static void
351free_padlist (pTHX_ AV *padlist) 515free_padlist (pTHX_ AV *padlist)
352{ 516{
353 /* may be during global destruction */ 517 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 518 if (!IN_DESTRUCT)
355 { 519 {
356 I32 i = AvFILLp (padlist); 520 I32 i = AvFILLp (padlist);
357 while (i >= 0) 521
522 while (i > 0) /* special-case index 0 */
358 { 523 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 524 /* we try to be extra-careful here */
360 if (svp) 525 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 526 I32 j = AvFILLp (av);
362 SV *sv; 527
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 528 while (j >= 0)
529 SvREFCNT_dec (AvARRAY (av)[j--]);
530
531 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 532 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 533 }
369 534
535 SvREFCNT_dec (AvARRAY (padlist)[0]);
536
537 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 538 SvREFCNT_dec ((SV*)padlist);
371 } 539 }
372} 540}
373 541
374static int 542static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 543coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 544{
377 AV *padlist; 545 AV *padlist;
378 AV *av = (AV *)mg->mg_obj; 546 AV *av = (AV *)mg->mg_obj;
547
548 /* perl manages to free our internal AV and _then_ call us */
549 if (IN_DESTRUCT)
550 return;
379 551
380 /* casting is fun. */ 552 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 553 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 554 free_padlist (aTHX_ padlist);
383 555
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 556 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 557
386 return 0; 558 return 0;
387} 559}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 560
392static MGVTBL coro_cv_vtbl = { 561static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 562 0, 0, 0, 0,
394 coro_cv_free 563 coro_cv_free
395}; 564};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 565
440/* the next two functions merely cache the padlists */ 566/* the next two functions merely cache the padlists */
441static void 567static void
442get_padlist (pTHX_ CV *cv) 568get_padlist (pTHX_ CV *cv)
443{ 569{
… …
449 else 575 else
450 { 576 {
451#if CORO_PREFER_PERL_FUNCTIONS 577#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 578 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 579 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 580 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 581 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 582 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 583 SvREFCNT_dec (cp);
458#else 584#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 585 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 586#endif
461 } 587 }
462} 588}
463 589
464static void 590static void
… …
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 597 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 598
473 av = (AV *)mg->mg_obj; 599 av = (AV *)mg->mg_obj;
474 600
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 601 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 602 av_extend (av, AvFILLp (av) + 1);
477 603
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 604 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 605}
480 606
481/** load & save, init *******************************************************/ 607/** load & save, init *******************************************************/
608
609static void
610on_enterleave_call (pTHX_ SV *cb);
482 611
483static void 612static void
484load_perl (pTHX_ Coro__State c) 613load_perl (pTHX_ Coro__State c)
485{ 614{
486 perl_slots *slot = c->slot; 615 perl_slots *slot = c->slot;
487 c->slot = 0; 616 c->slot = 0;
488 617
489 PL_mainstack = c->mainstack; 618 PL_mainstack = c->mainstack;
490 619
491 GvSV (PL_defgv) = slot->defsv; 620 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 621 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 622 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 623 GvSV (irsgv) = slot->irsgv;
624 GvHV (PL_hintgv) = slot->hinthv;
495 625
496 #define VAR(name,type) PL_ ## name = slot->name; 626 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 627 # include "state.h"
498 #undef VAR 628 #undef VAR
499 629
… …
513 PUTBACK; 643 PUTBACK;
514 } 644 }
515 645
516 slf_frame = c->slf_frame; 646 slf_frame = c->slf_frame;
517 CORO_THROW = c->except; 647 CORO_THROW = c->except;
648
649 if (expect_false (enable_times))
650 {
651 if (expect_false (!times_valid))
652 coro_times_update ();
653
654 coro_times_sub (c);
655 }
656
657 if (expect_false (c->on_enter))
658 {
659 int i;
660
661 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
662 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
663 }
518} 664}
519 665
520static void 666static void
521save_perl (pTHX_ Coro__State c) 667save_perl (pTHX_ Coro__State c)
522{ 668{
669 if (expect_false (c->on_leave))
670 {
671 int i;
672
673 for (i = AvFILLp (c->on_leave); i >= 0; --i)
674 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
675 }
676
677 times_valid = 0;
678
679 if (expect_false (enable_times))
680 {
681 coro_times_update (); times_valid = 1;
682 coro_times_add (c);
683 }
684
523 c->except = CORO_THROW; 685 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 686 c->slf_frame = slf_frame;
525 687
526 { 688 {
527 dSP; 689 dSP;
… …
540 { 702 {
541 while (expect_true (cxix >= 0)) 703 while (expect_true (cxix >= 0))
542 { 704 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 705 PERL_CONTEXT *cx = &ccstk[cxix--];
544 706
545 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 707 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
546 { 708 {
547 CV *cv = cx->blk_sub.cv; 709 CV *cv = cx->blk_sub.cv;
548 710
549 if (expect_true (CvDEPTH (cv))) 711 if (expect_true (CvDEPTH (cv)))
550 { 712 {
… …
585 c->mainstack = PL_mainstack; 747 c->mainstack = PL_mainstack;
586 748
587 { 749 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 750 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 751
590 slot->defav = GvAV (PL_defgv); 752 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 753 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 754 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 755 slot->irsgv = GvSV (irsgv);
756 slot->hinthv = GvHV (PL_hintgv);
594 757
595 #define VAR(name,type) slot->name = PL_ ## name; 758 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 759 # include "state.h"
597 #undef VAR 760 #undef VAR
598 } 761 }
… …
603 * of perl.c:init_stacks, except that it uses less memory 766 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 767 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 768 * not usually need a lot of stackspace.
606 */ 769 */
607#if CORO_PREFER_PERL_FUNCTIONS 770#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 771# define coro_init_stacks(thx) init_stacks ()
609#else 772#else
610static void 773static void
611coro_init_stacks (pTHX) 774coro_init_stacks (pTHX)
612{ 775{
613 PL_curstackinfo = new_stackinfo(32, 8); 776 PL_curstackinfo = new_stackinfo(32, 8);
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 839#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 840 Safefree (PL_retstack);
678#endif 841#endif
679} 842}
680 843
844#define CORO_RSS \
845 rss += sizeof (SYM (curstackinfo)); \
846 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
847 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
848 rss += SYM (tmps_max) * sizeof (SV *); \
849 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
850 rss += SYM (scopestack_max) * sizeof (I32); \
851 rss += SYM (savestack_max) * sizeof (ANY);
852
681static size_t 853static size_t
682coro_rss (pTHX_ struct coro *coro) 854coro_rss (pTHX_ struct coro *coro)
683{ 855{
684 size_t rss = sizeof (*coro); 856 size_t rss = sizeof (*coro);
685 857
686 if (coro->mainstack) 858 if (coro->mainstack)
687 { 859 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 860 if (coro->flags & CF_RUNNING)
692 { 861 {
693 slot = &tmp_slot; 862 #define SYM(sym) PL_ ## sym
694 863 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 864 #undef SYM
698 } 865 }
699 else 866 else
700 slot = coro->slot;
701
702 if (slot)
703 { 867 {
704 rss += sizeof (slot->curstackinfo); 868 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 869 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 870 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 871 }
716 } 872 }
717 873
718 return rss; 874 return rss;
719} 875}
… …
732#endif 888#endif
733 889
734/* 890/*
735 * This overrides the default magic get method of %SIG elements. 891 * This overrides the default magic get method of %SIG elements.
736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 892 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
737 * and instead of tryign to save and restore the hash elements, we just provide 893 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 894 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 895 */
743static int 896static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 897coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 898{
746 const char *s = MgPV_nolen_const (mg); 899 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 952 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 953
801 if (svp) 954 if (svp)
802 { 955 {
803 SV *old = *svp; 956 SV *old = *svp;
804 *svp = newSVsv (sv); 957 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 958 SvREFCNT_dec (old);
806 return 0; 959 return 0;
807 } 960 }
808 } 961 }
809 962
… …
819 972
820static int 973static int
821slf_check_nop (pTHX_ struct CoroSLF *frame) 974slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 975{
823 return 0; 976 return 0;
977}
978
979static int
980slf_check_repeat (pTHX_ struct CoroSLF *frame)
981{
982 return 1;
824} 983}
825 984
826static UNOP coro_setup_op; 985static UNOP coro_setup_op;
827 986
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 987static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
835 994
836 PL_runops = RUNOPS_DEFAULT; 995 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 996 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 997 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 998 PL_comppad = 0;
999 PL_comppad_name = 0;
1000 PL_comppad_name_fill = 0;
1001 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1002 PL_curpm = 0;
841 PL_curpad = 0; 1003 PL_curpad = 0;
842 PL_localizing = 0; 1004 PL_localizing = 0;
843 PL_dirty = 0; 1005 PL_dirty = 0;
844 PL_restartop = 0; 1006 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1007#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1008 PL_parser = 0;
847#endif 1009#endif
1010 PL_hints = 0;
848 1011
849 /* recreate the die/warn hooks */ 1012 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1013 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1014 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1015
853 GvSV (PL_defgv) = newSV (0); 1016 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1017 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1018 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1019 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1020 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1021 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1022 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1023
860 { 1024 {
861 dSP; 1025 dSP;
862 UNOP myop; 1026 UNOP myop;
863 1027
864 Zero (&myop, 1, UNOP); 1028 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1029 myop.op_next = Nullop;
1030 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1031 myop.op_flags = OPf_WANT_VOID;
867 1032
868 PUSHMARK (SP); 1033 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1034 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1035 PUTBACK;
871 PL_op = (OP *)&myop; 1036 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1037 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1038 }
875 1039
876 /* this newly created coroutine might be run on an existing cctx which most 1040 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1041 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1042 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1043 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1044 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1045
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1046 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 1047 coro_setup_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1048 coro_setup_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1049 coro_setup_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1050 /* no flags etc. required, as an init function won't be called */
887 1051
888 PL_op = (OP *)&coro_setup_op; 1052 PL_op = (OP *)&coro_setup_op;
889 1053
890 /* copy throw, in case it was set before coro_setup */ 1054 /* copy throw, in case it was set before coro_setup */
891 CORO_THROW = coro->except; 1055 CORO_THROW = coro->except;
892}
893 1056
1057 if (expect_false (enable_times))
1058 {
1059 coro_times_update ();
1060 coro_times_sub (coro);
1061 }
1062}
1063
894static void 1064static void
895coro_destruct (pTHX_ struct coro *coro) 1065coro_unwind_stacks (pTHX)
896{ 1066{
897 if (!IN_DESTRUCT) 1067 if (!IN_DESTRUCT)
898 { 1068 {
899 /* restore all saved variables and stuff */ 1069 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1070 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1078 POPSTACK_TO (PL_mainstack);
909 1079
910 /* unwind main stack */ 1080 /* unwind main stack */
911 dounwind (-1); 1081 dounwind (-1);
912 } 1082 }
1083}
913 1084
914 SvREFCNT_dec (GvSV (PL_defgv)); 1085static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1086coro_destruct_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1087{
917 SvREFCNT_dec (PL_defoutgv); 1088 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1089
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1090 {
924 SvREFCNT_dec (CORO_THROW); 1091 struct coro *current = SvSTATE_current;
1092
1093 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1094
1095 save_perl (aTHX_ current);
1096 load_perl (aTHX_ coro);
1097
1098 coro_unwind_stacks (aTHX);
1099 coro_destruct_stacks (aTHX);
1100
1101 // now save some sv's to be free'd later
1102 svf [0] = GvSV (PL_defgv);
1103 svf [1] = (SV *)GvAV (PL_defgv);
1104 svf [2] = GvSV (PL_errgv);
1105 svf [3] = (SV *)PL_defoutgv;
1106 svf [4] = PL_rs;
1107 svf [5] = GvSV (irsgv);
1108 svf [6] = (SV *)GvHV (PL_hintgv);
1109 svf [7] = PL_diehook;
1110 svf [8] = PL_warnhook;
1111 assert (9 == sizeof (svf) / sizeof (*svf));
1112
1113 load_perl (aTHX_ current);
1114 }
1115
1116 {
1117 int i;
1118
1119 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1120 SvREFCNT_dec (svf [i]);
1121
925 SvREFCNT_dec (coro->saved_deffh); 1122 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1123 SvREFCNT_dec (coro->rouse_cb);
927 1124 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1125 SvREFCNT_dec (coro->invoke_av);
1126 }
929} 1127}
930 1128
931INLINE void 1129INLINE void
932free_coro_mortal (pTHX) 1130free_coro_mortal (pTHX)
933{ 1131{
… …
941static int 1139static int
942runops_trace (pTHX) 1140runops_trace (pTHX)
943{ 1141{
944 COP *oldcop = 0; 1142 COP *oldcop = 0;
945 int oldcxix = -2; 1143 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1144
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1145 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1146 {
951 PERL_ASYNC_CHECK (); 1147 PERL_ASYNC_CHECK ();
952 1148
953 if (cctx->flags & CC_TRACE_ALL) 1149 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1150 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1151 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1152 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1153 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1154 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1155 AV *av = newAV (); /* return values */
960 SV **cb; 1156 SV **cb;
… …
997 1193
998 if (PL_curcop != &PL_compiling) 1194 if (PL_curcop != &PL_compiling)
999 { 1195 {
1000 SV **cb; 1196 SV **cb;
1001 1197
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1198 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1199 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1200 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1201
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1202 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1203 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1204 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1205 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1206 SV *fullname = sv_2mortal (newSV (0));
1012 1207
1013 if (isGV (gv)) 1208 if (isGV (gv))
… …
1018 SAVETMPS; 1213 SAVETMPS;
1019 EXTEND (SP, 3); 1214 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1215 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1216 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1217 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1218 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1219 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1220 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1221 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1222 SPAGAIN;
1028 FREETMPS; 1223 FREETMPS;
… …
1031 } 1226 }
1032 1227
1033 oldcxix = cxstack_ix; 1228 oldcxix = cxstack_ix;
1034 } 1229 }
1035 1230
1036 if (cctx->flags & CC_TRACE_LINE) 1231 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1232 {
1038 dSP; 1233 dSP;
1039 1234
1040 PL_runops = RUNOPS_DEFAULT; 1235 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1236 ENTER;
… …
1060 1255
1061 TAINT_NOT; 1256 TAINT_NOT;
1062 return 0; 1257 return 0;
1063} 1258}
1064 1259
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1260static struct CoroSLF cctx_ssl_frame;
1067 1261
1068static void 1262static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1263slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1264{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1265 ta->prev = 0;
1073} 1266}
1074 1267
1075static int 1268static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1269slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1270{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1273 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1274}
1082 1275
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1276/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1277static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1278cctx_prepare (pTHX)
1086{ 1279{
1087 PL_top_env = &PL_start_env; 1280 PL_top_env = &PL_start_env;
1088 1281
1089 if (cctx->flags & CC_TRACE) 1282 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1283 PL_runops = runops_trace;
1091 1284
1092 /* we already must be executing an SLF op, there is no other valid way 1285 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1286 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1287 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1288 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1289
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1290 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1291 cctx_ssl_frame = slf_frame;
1100 1292
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1293 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1294 slf_frame.check = slf_check_set_stacklevel;
1103} 1295}
… …
1126 /* normally we would need to skip the entersub here */ 1318 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1319 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1320 /* PL_nop = PL_nop->op_next */
1129 1321
1130 /* inject a fake subroutine call to cctx_init */ 1322 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1323 cctx_prepare (aTHX);
1132 1324
1133 /* cctx_run is the alternative tail of transfer() */ 1325 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1326 transfer_tail (aTHX);
1135 1327
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1328 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1329 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1330 perl_run (PL_curinterp);
1331 /*
1332 * Unfortunately, there is no way to get at the return values of the
1333 * coro body here, as perl_run destroys these
1334 */
1139 1335
1140 /* 1336 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1337 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1338 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1339 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1340 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1341 * coroutine as Coro has no such concept.
1342 * This actually isn't valid with the pthread backend, but OSes requiring
1343 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1344 */
1147 PL_top_env = main_top_env; 1345 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1346 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1347 }
1150} 1348}
… …
1227cctx_destroy (coro_cctx *cctx) 1425cctx_destroy (coro_cctx *cctx)
1228{ 1426{
1229 if (!cctx) 1427 if (!cctx)
1230 return; 1428 return;
1231 1429
1430 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1431
1232 --cctx_count; 1432 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1433 coro_destroy (&cctx->cctx);
1234 1434
1235 /* coro_transfer creates new, empty cctx's */ 1435 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1436 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1499 /* TODO: throwing up here is considered harmful */
1300 1500
1301 if (expect_true (prev != next)) 1501 if (expect_true (prev != next))
1302 { 1502 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1503 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1504 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1505
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1506 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1507 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1508
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1509#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1510 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1511 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1512#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1518transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1519{
1323 dSTACKLEVEL; 1520 dSTACKLEVEL;
1324 1521
1325 /* sometimes transfer is only called to set idle_sp */ 1522 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1523 if (expect_false (!prev))
1327 { 1524 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1525 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1526 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1527 }
1331 else if (expect_true (prev != next)) 1528 else if (expect_true (prev != next))
1332 { 1529 {
1333 coro_cctx *prev__cctx; 1530 coro_cctx *cctx_prev;
1334 1531
1335 if (expect_false (prev->flags & CF_NEW)) 1532 if (expect_false (prev->flags & CF_NEW))
1336 { 1533 {
1337 /* create a new empty/source context */ 1534 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1535 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1536 prev->flags |= CF_RUNNING;
1341 } 1537 }
1342 1538
1343 prev->flags &= ~CF_RUNNING; 1539 prev->flags &= ~CF_RUNNING;
… …
1354 coro_setup (aTHX_ next); 1550 coro_setup (aTHX_ next);
1355 } 1551 }
1356 else 1552 else
1357 load_perl (aTHX_ next); 1553 load_perl (aTHX_ next);
1358 1554
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1555 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1556 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1557 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1558 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1559 && !force_cctx
1366 )) 1560 ))
1367 { 1561 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1562 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1563 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1564
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1565 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1566 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1567 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1568 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1569 next->cctx = cctx_get (aTHX);
1378 1570
1379 cctx_put (prev__cctx); 1571 cctx_put (cctx_current);
1380 } 1572 }
1573 else
1574 prev->cctx = cctx_current;
1381 1575
1382 ++next->usecount; 1576 ++next->usecount;
1383 1577
1384 if (expect_true (!next->cctx)) 1578 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1579 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1580
1387 if (expect_false (prev__cctx != next->cctx)) 1581 next->cctx = 0;
1582
1583 if (expect_false (cctx_prev != cctx_current))
1388 { 1584 {
1389 prev__cctx->top_env = PL_top_env; 1585 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1586 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1587 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1588 }
1393 1589
1394 transfer_tail (aTHX); 1590 transfer_tail (aTHX);
1395 } 1591 }
1396} 1592}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1600coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1601{
1406 if (coro->flags & CF_DESTROYED) 1602 if (coro->flags & CF_DESTROYED)
1407 return 0; 1603 return 0;
1408 1604
1409 if (coro->on_destroy) 1605 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1606 coro->on_destroy (aTHX_ coro);
1411 1607
1412 coro->flags |= CF_DESTROYED; 1608 coro->flags |= CF_DESTROYED;
1413 1609
1414 if (coro->flags & CF_READY) 1610 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1614 --coro_nready;
1419 } 1615 }
1420 else 1616 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1617 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1618
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1619 if (coro->mainstack
1424 { 1620 && coro->mainstack != main_mainstack
1425 struct coro temp; 1621 && coro->slot
1426 1622 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro); 1623 coro_destruct_perl (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438 1624
1439 cctx_destroy (coro->cctx); 1625 cctx_destroy (coro->cctx);
1626 SvREFCNT_dec (coro->startcv);
1440 SvREFCNT_dec (coro->args); 1627 SvREFCNT_dec (coro->args);
1628 SvREFCNT_dec (CORO_THROW);
1441 1629
1442 if (coro->next) coro->next->prev = coro->prev; 1630 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1631 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1632 if (coro == coro_first) coro_first = coro->next;
1445 1633
… …
1527/** Coro ********************************************************************/ 1715/** Coro ********************************************************************/
1528 1716
1529INLINE void 1717INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1718coro_enq (pTHX_ struct coro *coro)
1531{ 1719{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1720 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1721
1535INLINE SV * 1722 SvREFCNT_inc_NN (coro->hv);
1723
1724 coro->next_ready = 0;
1725 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1726 ready [1] = coro;
1727}
1728
1729INLINE struct coro *
1536coro_deq (pTHX) 1730coro_deq (pTHX)
1537{ 1731{
1538 int prio; 1732 int prio;
1539 1733
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1734 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1735 {
1542 return av_shift (coro_ready [prio]); 1736 struct coro **ready = coro_ready [prio];
1737
1738 if (ready [0])
1739 {
1740 struct coro *coro = ready [0];
1741 ready [0] = coro->next_ready;
1742 return coro;
1743 }
1744 }
1543 1745
1544 return 0; 1746 return 0;
1545} 1747}
1546 1748
1547static int 1749static int
… …
1549{ 1751{
1550 struct coro *coro; 1752 struct coro *coro;
1551 SV *sv_hook; 1753 SV *sv_hook;
1552 void (*xs_hook)(void); 1754 void (*xs_hook)(void);
1553 1755
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1756 coro = SvSTATE (coro_sv);
1558 1757
1559 if (coro->flags & CF_READY) 1758 if (coro->flags & CF_READY)
1560 return 0; 1759 return 0;
1561 1760
… …
1592api_is_ready (pTHX_ SV *coro_sv) 1791api_is_ready (pTHX_ SV *coro_sv)
1593{ 1792{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1793 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1794}
1596 1795
1796/* expects to own a reference to next->hv */
1597INLINE void 1797INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1798prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1799{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1800 SV *prev_sv = SvRV (coro_current);
1801
1639 ta->prev = SvSTATE_hv (prev_sv); 1802 ta->prev = SvSTATE_hv (prev_sv);
1803 ta->next = next;
1804
1640 TRANSFER_CHECK (*ta); 1805 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1806
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1807 SvRV_set (coro_current, (SV *)next->hv);
1644 1808
1645 free_coro_mortal (aTHX); 1809 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1810 coro_mortal = prev_sv;
1647} 1811}
1648 1812
1813static void
1814prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1815{
1816 for (;;)
1817 {
1818 struct coro *next = coro_deq (aTHX);
1819
1820 if (expect_true (next))
1821 {
1822 /* cannot transfer to destroyed coros, skip and look for next */
1823 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1824 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1825 else
1826 {
1827 next->flags &= ~CF_READY;
1828 --coro_nready;
1829
1830 prepare_schedule_to (aTHX_ ta, next);
1831 break;
1832 }
1833 }
1834 else
1835 {
1836 /* nothing to schedule: call the idle handler */
1837 if (SvROK (sv_idle)
1838 && SvOBJECT (SvRV (sv_idle)))
1839 {
1840 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1841 api_ready (aTHX_ SvRV (sv_idle));
1842 --coro_nready;
1843 }
1844 else
1845 {
1846 dSP;
1847
1848 ENTER;
1849 SAVETMPS;
1850
1851 PUSHMARK (SP);
1852 PUTBACK;
1853 call_sv (sv_idle, G_VOID | G_DISCARD);
1854
1855 FREETMPS;
1856 LEAVE;
1857 }
1858 }
1859 }
1860}
1861
1649INLINE void 1862INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1863prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1864{
1652 api_ready (aTHX_ coro_current); 1865 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1866 prepare_schedule (aTHX_ ta);
… …
1672{ 1885{
1673 struct coro_transfer_args ta; 1886 struct coro_transfer_args ta;
1674 1887
1675 prepare_schedule (aTHX_ &ta); 1888 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1889 TRANSFER (ta, 1);
1890}
1891
1892static void
1893api_schedule_to (pTHX_ SV *coro_sv)
1894{
1895 struct coro_transfer_args ta;
1896 struct coro *next = SvSTATE (coro_sv);
1897
1898 SvREFCNT_inc_NN (coro_sv);
1899 prepare_schedule_to (aTHX_ &ta, next);
1677} 1900}
1678 1901
1679static int 1902static int
1680api_cede (pTHX) 1903api_cede (pTHX)
1681{ 1904{
… …
1710static void 1933static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1934api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1935{
1713 struct coro *coro = SvSTATE (coro_sv); 1936 struct coro *coro = SvSTATE (coro_sv);
1714 1937
1938 if (coro->flags & CF_RUNNING)
1939 croak ("cannot enable tracing on a running coroutine, caught");
1940
1715 if (flags & CC_TRACE) 1941 if (flags & CC_TRACE)
1716 { 1942 {
1717 if (!coro->cctx) 1943 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1944 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1945 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1946 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1947
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1948 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1949 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1950 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1951 {
… …
1730 else 1956 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1957 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1958 }
1733} 1959}
1734 1960
1961static void
1962coro_call_on_destroy (pTHX_ struct coro *coro)
1963{
1964 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1965 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1966
1967 if (on_destroyp)
1968 {
1969 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1970
1971 while (AvFILLp (on_destroy) >= 0)
1972 {
1973 dSP; /* don't disturb outer sp */
1974 SV *cb = av_pop (on_destroy);
1975
1976 PUSHMARK (SP);
1977
1978 if (statusp)
1979 {
1980 int i;
1981 AV *status = (AV *)SvRV (*statusp);
1982 EXTEND (SP, AvFILLp (status) + 1);
1983
1984 for (i = 0; i <= AvFILLp (status); ++i)
1985 PUSHs (AvARRAY (status)[i]);
1986 }
1987
1988 PUTBACK;
1989 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1990 }
1991 }
1992}
1993
1994static void
1995slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1996{
1997 int i;
1998 HV *hv = (HV *)SvRV (coro_current);
1999 AV *av = newAV ();
2000
2001 av_extend (av, items - 1);
2002 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004
2005 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2006
2007 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2008 api_ready (aTHX_ sv_manager);
2009
2010 frame->prepare = prepare_schedule;
2011 frame->check = slf_check_repeat;
2012
2013 /* as a minor optimisation, we could unwind all stacks here */
2014 /* but that puts extra pressure on pp_slf, and is not worth much */
2015 /*coro_unwind_stacks (aTHX);*/
2016}
2017
2018/*****************************************************************************/
2019/* async pool handler */
2020
2021static int
2022slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2023{
2024 HV *hv = (HV *)SvRV (coro_current);
2025 struct coro *coro = (struct coro *)frame->data;
2026
2027 if (!coro->invoke_cb)
2028 return 1; /* loop till we have invoke */
2029 else
2030 {
2031 hv_store (hv, "desc", sizeof ("desc") - 1,
2032 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2033
2034 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2035
2036 {
2037 dSP;
2038 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2039 PUTBACK;
2040 }
2041
2042 SvREFCNT_dec (GvAV (PL_defgv));
2043 GvAV (PL_defgv) = coro->invoke_av;
2044 coro->invoke_av = 0;
2045
2046 return 0;
2047 }
2048}
2049
2050static void
2051slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2052{
2053 HV *hv = (HV *)SvRV (coro_current);
2054 struct coro *coro = SvSTATE_hv ((SV *)hv);
2055
2056 if (expect_true (coro->saved_deffh))
2057 {
2058 /* subsequent iteration */
2059 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2060 coro->saved_deffh = 0;
2061
2062 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2063 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2064 {
2065 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2066 coro->invoke_av = newAV ();
2067
2068 frame->prepare = prepare_nop;
2069 }
2070 else
2071 {
2072 av_clear (GvAV (PL_defgv));
2073 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2074
2075 coro->prio = 0;
2076
2077 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2078 api_trace (aTHX_ coro_current, 0);
2079
2080 frame->prepare = prepare_schedule;
2081 av_push (av_async_pool, SvREFCNT_inc (hv));
2082 }
2083 }
2084 else
2085 {
2086 /* first iteration, simply fall through */
2087 frame->prepare = prepare_nop;
2088 }
2089
2090 frame->check = slf_check_pool_handler;
2091 frame->data = (void *)coro;
2092}
2093
1735/*****************************************************************************/ 2094/*****************************************************************************/
1736/* rouse callback */ 2095/* rouse callback */
1737 2096
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2097#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2098
… …
1744 SV *data = (SV *)GENSUB_ARG; 2103 SV *data = (SV *)GENSUB_ARG;
1745 2104
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2105 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2106 {
1748 /* first call, set args */ 2107 /* first call, set args */
1749 int i; 2108 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2109 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2110
1753 SvRV_set (data, (SV *)av); 2111 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2112
1757 /* better take a full copy of the arguments */ 2113 /* better take a full copy of the arguments */
1758 while (items--) 2114 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2115 av_store (av, items, newSVsv (ST (items)));
2116
2117 api_ready (aTHX_ coro);
2118 SvREFCNT_dec (coro);
1760 } 2119 }
1761 2120
1762 XSRETURN_EMPTY; 2121 XSRETURN_EMPTY;
1763} 2122}
1764 2123
… …
1781 2140
1782 EXTEND (SP, AvFILLp (av) + 1); 2141 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2142 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2143 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2144
1786 /* we have stolen the elements, so ste length to zero and free */ 2145 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2146 AvFILLp (av) = -1;
1788 av_undef (av); 2147 av_undef (av);
1789 2148
1790 PUTBACK; 2149 PUTBACK;
1791 } 2150 }
… …
1895static void 2254static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2255slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2256{
1898 frame->prepare = prepare_schedule; 2257 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2258 frame->check = slf_check_nop;
2259}
2260
2261static void
2262slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2263{
2264 struct coro *next = (struct coro *)slf_frame.data;
2265
2266 SvREFCNT_inc_NN (next->hv);
2267 prepare_schedule_to (aTHX_ ta, next);
2268}
2269
2270static void
2271slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2272{
2273 if (!items)
2274 croak ("Coro::schedule_to expects a coroutine argument, caught");
2275
2276 frame->data = (void *)SvSTATE (arg [0]);
2277 frame->prepare = slf_prepare_schedule_to;
2278 frame->check = slf_check_nop;
2279}
2280
2281static void
2282slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2283{
2284 api_ready (aTHX_ SvRV (coro_current));
2285
2286 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2287}
1901 2288
1902static void 2289static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2290slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2291{
… …
2050 } 2437 }
2051 else 2438 else
2052 slf_argc = 0; 2439 slf_argc = 0;
2053 2440
2054 PL_op->op_ppaddr = pp_slf; 2441 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2442 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2443
2057 PL_op = (OP *)&slf_restore; 2444 PL_op = (OP *)&slf_restore;
2445}
2446
2447/*****************************************************************************/
2448/* dynamic wind */
2449
2450static void
2451on_enterleave_call (pTHX_ SV *cb)
2452{
2453 dSP;
2454
2455 PUSHSTACK;
2456
2457 PUSHMARK (SP);
2458 PUTBACK;
2459 call_sv (cb, G_VOID | G_DISCARD);
2460 SPAGAIN;
2461
2462 POPSTACK;
2463}
2464
2465static SV *
2466coro_avp_pop_and_free (pTHX_ AV **avp)
2467{
2468 AV *av = *avp;
2469 SV *res = av_pop (av);
2470
2471 if (AvFILLp (av) < 0)
2472 {
2473 *avp = 0;
2474 SvREFCNT_dec (av);
2475 }
2476
2477 return res;
2478}
2479
2480static void
2481coro_pop_on_enter (pTHX_ void *coro)
2482{
2483 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2484 SvREFCNT_dec (cb);
2485}
2486
2487static void
2488coro_pop_on_leave (pTHX_ void *coro)
2489{
2490 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2491 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2492}
2059 2493
2060/*****************************************************************************/ 2494/*****************************************************************************/
2061/* PerlIO::cede */ 2495/* PerlIO::cede */
2062 2496
… …
2136/* Coro::Semaphore & Coro::Signal */ 2570/* Coro::Semaphore & Coro::Signal */
2137 2571
2138static SV * 2572static SV *
2139coro_waitarray_new (pTHX_ int count) 2573coro_waitarray_new (pTHX_ int count)
2140{ 2574{
2141 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2575 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2142 AV *av = newAV (); 2576 AV *av = newAV ();
2143 SV **ary; 2577 SV **ary;
2144 2578
2145 /* unfortunately, building manually saves memory */ 2579 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2580 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2581 AvALLOC (av) = ary;
2148 SvPV_set ((SV *)av, (char *)ary); /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2582#if PERL_VERSION_ATLEAST (5,10,0)
2583 AvARRAY (av) = ary;
2584#else
2585 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2586 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2587 SvPVX ((SV *)av) = (char *)ary;
2588#endif
2149 AvMAX (av) = 1; 2589 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2590 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2591 ary [0] = newSViv (count);
2152 2592
2153 return newRV_noinc ((SV *)av); 2593 return newRV_noinc ((SV *)av);
… …
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2613 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2614 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2615 cb = av_shift (av);
2176 2616
2177 if (SvOBJECT (cb)) 2617 if (SvOBJECT (cb))
2618 {
2178 api_ready (aTHX_ cb); 2619 api_ready (aTHX_ cb);
2179 else 2620 --count;
2180 croak ("callbacks not yet supported"); 2621 }
2622 else if (SvTYPE (cb) == SVt_PVCV)
2623 {
2624 dSP;
2625 PUSHMARK (SP);
2626 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2627 PUTBACK;
2628 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2629 }
2181 2630
2182 SvREFCNT_dec (cb); 2631 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2632 }
2186} 2633}
2187 2634
2188static void 2635static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2636coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2271} 2718}
2272 2719
2273static void 2720static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2721slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2722{
2723 if (items >= 2)
2724 {
2725 /* callback form */
2726 AV *av = (AV *)SvRV (arg [0]);
2727 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2728
2729 av_push (av, SvREFCNT_inc_NN (cb_cv));
2730
2731 if (SvIVX (AvARRAY (av)[0]) > 0)
2732 coro_semaphore_adjust (aTHX_ av, 0);
2733
2734 frame->prepare = prepare_nop;
2735 frame->check = slf_check_nop;
2736 }
2737 else
2738 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2739 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2740 frame->check = slf_check_semaphore_wait;
2741 }
2278} 2742}
2279 2743
2280/* signal */ 2744/* signal */
2281 2745
2282static void 2746static void
… …
2294 AvARRAY (av)[0] = AvARRAY (av)[1]; 2758 AvARRAY (av)[0] = AvARRAY (av)[1];
2295 AvARRAY (av)[1] = cb; 2759 AvARRAY (av)[1] = cb;
2296 2760
2297 cb = av_shift (av); 2761 cb = av_shift (av);
2298 2762
2763 if (SvTYPE (cb) == SVt_PVCV)
2764 {
2765 dSP;
2766 PUSHMARK (SP);
2767 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2768 PUTBACK;
2769 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2770 }
2771 else
2772 {
2299 api_ready (aTHX_ cb); 2773 api_ready (aTHX_ cb);
2300 sv_setiv (cb, 0); /* signal waiter */ 2774 sv_setiv (cb, 0); /* signal waiter */
2775 }
2776
2301 SvREFCNT_dec (cb); 2777 SvREFCNT_dec (cb);
2302 2778
2303 --count; 2779 --count;
2304 } 2780 }
2305} 2781}
… …
2314static void 2790static void
2315slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2791slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{ 2792{
2317 AV *av = (AV *)SvRV (arg [0]); 2793 AV *av = (AV *)SvRV (arg [0]);
2318 2794
2795 if (items >= 2)
2796 {
2797 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2798 av_push (av, SvREFCNT_inc_NN (cb_cv));
2799
2319 if (SvIVX (AvARRAY (av)[0])) 2800 if (SvIVX (AvARRAY (av)[0]))
2801 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2802
2803 frame->prepare = prepare_nop;
2804 frame->check = slf_check_nop;
2805 }
2806 else if (SvIVX (AvARRAY (av)[0]))
2320 { 2807 {
2321 SvIVX (AvARRAY (av)[0]) = 0; 2808 SvIVX (AvARRAY (av)[0]) = 0;
2322 frame->prepare = prepare_nop; 2809 frame->prepare = prepare_nop;
2323 frame->check = slf_check_nop; 2810 frame->check = slf_check_nop;
2324 } 2811 }
2325 else 2812 else
2326 { 2813 {
2327 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2814 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2328 2815
2329 av_push (av, waiter); 2816 av_push (av, waiter);
2330 2817
2331 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2818 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2332 frame->prepare = prepare_schedule; 2819 frame->prepare = prepare_schedule;
… …
2354 dXSARGS; 2841 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2842 AV *state = (AV *)GENSUB_ARG;
2356 SV *coro = av_pop (state); 2843 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2844 SV *data_sv = newSV (sizeof (struct io_state));
2358 2845
2359 av_extend (state, items); 2846 av_extend (state, items - 1);
2360 2847
2361 sv_upgrade (data_sv, SVt_PV); 2848 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2849 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2850 SvPOK_only (data_sv);
2364 2851
… …
2499 XSRETURN_EMPTY; 2986 XSRETURN_EMPTY;
2500} 2987}
2501 2988
2502/*****************************************************************************/ 2989/*****************************************************************************/
2503 2990
2991#if CORO_CLONE
2992# include "clone.c"
2993#endif
2994
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2995MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 2996
2506PROTOTYPES: DISABLE 2997PROTOTYPES: DISABLE
2507 2998
2508BOOT: 2999BOOT:
… …
2512 coro_thx = PERL_GET_CONTEXT; 3003 coro_thx = PERL_GET_CONTEXT;
2513# endif 3004# endif
2514#endif 3005#endif
2515 BOOT_PAGESIZE; 3006 BOOT_PAGESIZE;
2516 3007
3008 cctx_current = cctx_new_empty ();
3009
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3010 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3011 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 3012
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3013 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3014 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2540 3033
2541 { 3034 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3035 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 3036
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3037 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 3038 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 3039
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3040 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 3041 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 3042 }
2552 3043
2553 coroapi.ver = CORO_API_VERSION; 3044 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 3045 coroapi.rev = CORO_API_REVISION;
2555 3046
… …
2567 3058
2568 if (!svp) croak ("Time::HiRes is required"); 3059 if (!svp) croak ("Time::HiRes is required");
2569 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3060 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2570 3061
2571 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3062 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3063
3064 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3065 u2time = INT2PTR (double (*)(), SvIV (*svp));
2572 } 3066 }
2573 3067
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3068 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2575} 3069}
2576 3070
2577SV * 3071SV *
2578new (char *klass, ...) 3072new (char *klass, ...)
3073 ALIAS:
3074 Coro::new = 1
2579 CODE: 3075 CODE:
2580{ 3076{
2581 struct coro *coro; 3077 struct coro *coro;
2582 MAGIC *mg; 3078 MAGIC *mg;
2583 HV *hv; 3079 HV *hv;
3080 CV *cb;
2584 int i; 3081 int i;
3082
3083 if (items > 1)
3084 {
3085 cb = coro_sv_2cv (aTHX_ ST (1));
3086
3087 if (!ix)
3088 {
3089 if (CvISXSUB (cb))
3090 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3091
3092 if (!CvROOT (cb))
3093 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3094 }
3095 }
2585 3096
2586 Newz (0, coro, 1, struct coro); 3097 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV (); 3098 coro->args = newAV ();
2588 coro->flags = CF_NEW; 3099 coro->flags = CF_NEW;
2589 3100
… …
2594 coro->hv = hv = newHV (); 3105 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3106 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP; 3107 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3108 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598 3109
3110 if (items > 1)
3111 {
2599 av_extend (coro->args, items - 1); 3112 av_extend (coro->args, items - 1 + ix - 1);
3113
3114 if (ix)
3115 {
3116 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3117 cb = cv_coro_run;
3118 }
3119
3120 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3121
2600 for (i = 1; i < items; i++) 3122 for (i = 2; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i))); 3123 av_push (coro->args, newSVsv (ST (i)));
3124 }
2602} 3125}
2603 OUTPUT: 3126 OUTPUT:
2604 RETVAL 3127 RETVAL
2605 3128
2606void 3129void
… …
2619void 3142void
2620_exit (int code) 3143_exit (int code)
2621 PROTOTYPE: $ 3144 PROTOTYPE: $
2622 CODE: 3145 CODE:
2623 _exit (code); 3146 _exit (code);
3147
3148SV *
3149clone (Coro::State coro)
3150 CODE:
3151{
3152#if CORO_CLONE
3153 struct coro *ncoro = coro_clone (aTHX_ coro);
3154 MAGIC *mg;
3155 /* TODO: too much duplication */
3156 ncoro->hv = newHV ();
3157 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3158 mg->mg_flags |= MGf_DUP;
3159 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3160#else
3161 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3162#endif
3163}
3164 OUTPUT:
3165 RETVAL
2624 3166
2625int 3167int
2626cctx_stacksize (int new_stacksize = 0) 3168cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 3169 PROTOTYPE: ;$
2628 CODE: 3170 CODE:
… …
2678 eval = 1 3220 eval = 1
2679 CODE: 3221 CODE:
2680{ 3222{
2681 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3223 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2682 { 3224 {
2683 struct coro temp; 3225 struct coro *current = SvSTATE_current;
2684 3226
2685 if (!(coro->flags & CF_RUNNING)) 3227 if (current != coro)
2686 { 3228 {
2687 PUTBACK; 3229 PUTBACK;
2688 save_perl (aTHX_ &temp); 3230 save_perl (aTHX_ current);
2689 load_perl (aTHX_ coro); 3231 load_perl (aTHX_ coro);
3232 SPAGAIN;
2690 } 3233 }
2691 3234
2692 {
2693 dSP;
2694 ENTER;
2695 SAVETMPS;
2696 PUTBACK;
2697 PUSHSTACK; 3235 PUSHSTACK;
3236
2698 PUSHMARK (SP); 3237 PUSHMARK (SP);
3238 PUTBACK;
2699 3239
2700 if (ix) 3240 if (ix)
2701 eval_sv (coderef, 0); 3241 eval_sv (coderef, 0);
2702 else 3242 else
2703 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3243 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2704 3244
2705 POPSTACK; 3245 POPSTACK;
2706 SPAGAIN; 3246 SPAGAIN;
2707 FREETMPS;
2708 LEAVE;
2709 PUTBACK;
2710 }
2711 3247
2712 if (!(coro->flags & CF_RUNNING)) 3248 if (current != coro)
2713 { 3249 {
3250 PUTBACK;
2714 save_perl (aTHX_ coro); 3251 save_perl (aTHX_ coro);
2715 load_perl (aTHX_ &temp); 3252 load_perl (aTHX_ current);
2716 SPAGAIN; 3253 SPAGAIN;
2717 } 3254 }
2718 } 3255 }
2719} 3256}
2720 3257
… …
2724 ALIAS: 3261 ALIAS:
2725 is_ready = CF_READY 3262 is_ready = CF_READY
2726 is_running = CF_RUNNING 3263 is_running = CF_RUNNING
2727 is_new = CF_NEW 3264 is_new = CF_NEW
2728 is_destroyed = CF_DESTROYED 3265 is_destroyed = CF_DESTROYED
3266 is_suspended = CF_SUSPENDED
2729 CODE: 3267 CODE:
2730 RETVAL = boolSV (coro->flags & ix); 3268 RETVAL = boolSV (coro->flags & ix);
2731 OUTPUT: 3269 OUTPUT:
2732 RETVAL 3270 RETVAL
2733 3271
… …
2737 CODE: 3275 CODE:
2738{ 3276{
2739 struct coro *current = SvSTATE_current; 3277 struct coro *current = SvSTATE_current;
2740 SV **throwp = self == current ? &CORO_THROW : &self->except; 3278 SV **throwp = self == current ? &CORO_THROW : &self->except;
2741 SvREFCNT_dec (*throwp); 3279 SvREFCNT_dec (*throwp);
3280 SvGETMAGIC (throw);
2742 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3281 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2743} 3282}
2744 3283
2745void 3284void
2746api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3285api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2749 3288
2750SV * 3289SV *
2751has_cctx (Coro::State coro) 3290has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3291 PROTOTYPE: $
2753 CODE: 3292 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3293 /* maybe manage the running flag differently */
3294 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3295 OUTPUT:
2756 RETVAL 3296 RETVAL
2757 3297
2758int 3298int
2759is_traced (Coro::State coro) 3299is_traced (Coro::State coro)
… …
2779 3319
2780void 3320void
2781force_cctx () 3321force_cctx ()
2782 PROTOTYPE: 3322 PROTOTYPE:
2783 CODE: 3323 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3324 cctx_current->idle_sp = 0;
2785 3325
2786void 3326void
2787swap_defsv (Coro::State self) 3327swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3328 PROTOTYPE: $
2789 ALIAS: 3329 ALIAS:
… …
2797 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3337 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2798 3338
2799 SV *tmp = *src; *src = *dst; *dst = tmp; 3339 SV *tmp = *src; *src = *dst; *dst = tmp;
2800 } 3340 }
2801 3341
3342void
3343cancel (Coro::State self)
3344 CODE:
3345 coro_state_destroy (aTHX_ self);
3346 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3347
3348
3349SV *
3350enable_times (int enabled = enable_times)
3351 CODE:
3352{
3353 RETVAL = boolSV (enable_times);
3354
3355 if (enabled != enable_times)
3356 {
3357 enable_times = enabled;
3358
3359 coro_times_update ();
3360 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3361 }
3362}
3363 OUTPUT:
3364 RETVAL
3365
3366void
3367times (Coro::State self)
3368 PPCODE:
3369{
3370 struct coro *current = SvSTATE (coro_current);
3371
3372 if (expect_false (current == self))
3373 {
3374 coro_times_update ();
3375 coro_times_add (SvSTATE (coro_current));
3376 }
3377
3378 EXTEND (SP, 2);
3379 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3380 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3381
3382 if (expect_false (current == self))
3383 coro_times_sub (SvSTATE (coro_current));
3384}
2802 3385
2803MODULE = Coro::State PACKAGE = Coro 3386MODULE = Coro::State PACKAGE = Coro
2804 3387
2805BOOT: 3388BOOT:
2806{ 3389{
2807 int i;
2808
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3390 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3391 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3392 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3393 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3394 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3395 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3396 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3397 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3398 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3399
3400 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3401 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3402 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3403 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2815 3404
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3405 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3406
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3407 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3408 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3409 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2821 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3410 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2822 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3411 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2823 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3412 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2824
2825 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2826 coro_ready[i] = newAV ();
2827 3413
2828 { 3414 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3415 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3416
2831 coroapi.schedule = api_schedule; 3417 coroapi.schedule = api_schedule;
3418 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3419 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3420 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3421 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3422 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3423 coroapi.nready = coro_nready;
… …
2841 SvREADONLY_on (sv); 3428 SvREADONLY_on (sv);
2842 } 3429 }
2843} 3430}
2844 3431
2845void 3432void
3433terminate (...)
3434 CODE:
3435 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3436
3437void
2846schedule (...) 3438schedule (...)
2847 CODE: 3439 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3440 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3441
3442void
3443schedule_to (...)
3444 CODE:
3445 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3446
3447void
3448cede_to (...)
3449 CODE:
3450 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3451
2850void 3452void
2851cede (...) 3453cede (...)
2852 CODE: 3454 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3455 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2867void 3469void
2868_set_readyhook (SV *hook) 3470_set_readyhook (SV *hook)
2869 PROTOTYPE: $ 3471 PROTOTYPE: $
2870 CODE: 3472 CODE:
2871 SvREFCNT_dec (coro_readyhook); 3473 SvREFCNT_dec (coro_readyhook);
3474 SvGETMAGIC (hook);
2872 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3475 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2873 3476
2874int 3477int
2875prio (Coro::State coro, int newprio = 0) 3478prio (Coro::State coro, int newprio = 0)
2876 PROTOTYPE: $;$ 3479 PROTOTYPE: $;$
… …
2883 if (items > 1) 3486 if (items > 1)
2884 { 3487 {
2885 if (ix) 3488 if (ix)
2886 newprio = coro->prio - newprio; 3489 newprio = coro->prio - newprio;
2887 3490
2888 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3491 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2889 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3492 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2890 3493
2891 coro->prio = newprio; 3494 coro->prio = newprio;
2892 } 3495 }
2893} 3496}
2894 OUTPUT: 3497 OUTPUT:
… …
2908 CODE: 3511 CODE:
2909 RETVAL = coro_nready; 3512 RETVAL = coro_nready;
2910 OUTPUT: 3513 OUTPUT:
2911 RETVAL 3514 RETVAL
2912 3515
2913# for async_pool speedup
2914void 3516void
2915_pool_1 (SV *cb) 3517suspend (Coro::State self)
3518 PROTOTYPE: $
2916 CODE: 3519 CODE:
2917{ 3520 self->flags |= CF_SUSPENDED;
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3521
2925 if (!invoke) 3522void
3523resume (Coro::State self)
3524 PROTOTYPE: $
3525 CODE:
3526 self->flags &= ~CF_SUSPENDED;
3527
3528void
3529_pool_handler (...)
3530 CODE:
3531 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3532
3533void
3534async_pool (SV *cv, ...)
3535 PROTOTYPE: &@
3536 PPCODE:
3537{
3538 HV *hv = (HV *)av_pop (av_async_pool);
3539 AV *av = newAV ();
3540 SV *cb = ST (0);
3541 int i;
3542
3543 av_extend (av, items - 2);
3544 for (i = 1; i < items; ++i)
3545 av_push (av, SvREFCNT_inc_NN (ST (i)));
3546
3547 if ((SV *)hv == &PL_sv_undef)
2926 { 3548 {
2927 SV *old = PL_diehook; 3549 PUSHMARK (SP);
2928 PL_diehook = 0; 3550 EXTEND (SP, 2);
2929 SvREFCNT_dec (old); 3551 PUSHs (sv_Coro);
2930 croak ("\3async_pool terminate\2\n"); 3552 PUSHs ((SV *)cv_pool_handler);
3553 PUTBACK;
3554 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3555 SPAGAIN;
3556
3557 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2931 } 3558 }
2932 3559
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3560 {
2946 av_fill (defav, len - 1); 3561 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3562
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3563 assert (!coro->invoke_cb);
3564 assert (!coro->invoke_av);
3565 coro->invoke_cb = SvREFCNT_inc (cb);
3566 coro->invoke_av = av;
2949 } 3567 }
2950}
2951 3568
2952void 3569 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3570
2959 sv_setsv (cb, &PL_sv_undef); 3571 if (GIMME_V != G_VOID)
2960 3572 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3573 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3574 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3575}
2984 3576
2985SV * 3577SV *
2986rouse_cb () 3578rouse_cb ()
2987 PROTOTYPE: 3579 PROTOTYPE:
… …
2989 RETVAL = coro_new_rouse_cb (aTHX); 3581 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3582 OUTPUT:
2991 RETVAL 3583 RETVAL
2992 3584
2993void 3585void
2994rouse_wait (SV *cb = 0) 3586rouse_wait (...)
2995 PROTOTYPE: ;$ 3587 PROTOTYPE: ;$
2996 PPCODE: 3588 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3589 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3590
3591void
3592on_enter (SV *block)
3593 ALIAS:
3594 on_leave = 1
3595 PROTOTYPE: &
3596 CODE:
3597{
3598 struct coro *coro = SvSTATE_current;
3599 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3600
3601 block = (SV *)coro_sv_2cv (aTHX_ block);
3602
3603 if (!*avp)
3604 *avp = newAV ();
3605
3606 av_push (*avp, SvREFCNT_inc (block));
3607
3608 if (!ix)
3609 on_enterleave_call (aTHX_ block);
3610
3611 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3612 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3613 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3614}
3615
2999 3616
3000MODULE = Coro::State PACKAGE = PerlIO::cede 3617MODULE = Coro::State PACKAGE = PerlIO::cede
3001 3618
3002BOOT: 3619BOOT:
3003 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3620 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3006MODULE = Coro::State PACKAGE = Coro::Semaphore 3623MODULE = Coro::State PACKAGE = Coro::Semaphore
3007 3624
3008SV * 3625SV *
3009new (SV *klass, SV *count = 0) 3626new (SV *klass, SV *count = 0)
3010 CODE: 3627 CODE:
3628{
3629 int semcnt = 1;
3630
3631 if (count)
3632 {
3633 SvGETMAGIC (count);
3634
3635 if (SvOK (count))
3636 semcnt = SvIV (count);
3637 }
3638
3011 RETVAL = sv_bless ( 3639 RETVAL = sv_bless (
3012 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3640 coro_waitarray_new (aTHX_ semcnt),
3013 GvSTASH (CvGV (cv)) 3641 GvSTASH (CvGV (cv))
3014 ); 3642 );
3643}
3015 OUTPUT: 3644 OUTPUT:
3016 RETVAL 3645 RETVAL
3017 3646
3018# helper for Coro::Channel 3647# helper for Coro::Channel and others
3019SV * 3648SV *
3020_alloc (int count) 3649_alloc (int count)
3021 CODE: 3650 CODE:
3022 RETVAL = coro_waitarray_new (aTHX_ count); 3651 RETVAL = coro_waitarray_new (aTHX_ count);
3023 OUTPUT: 3652 OUTPUT:
… …
3036 adjust = 1 3665 adjust = 1
3037 CODE: 3666 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3667 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3668
3040void 3669void
3041down (SV *self) 3670down (...)
3042 CODE: 3671 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3672 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3673
3045void 3674void
3046wait (SV *self) 3675wait (...)
3047 CODE: 3676 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3677 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3678
3050void 3679void
3051try (SV *self) 3680try (SV *self)
… …
3081 for (i = 1; i <= wcount; ++i) 3710 for (i = 1; i <= wcount; ++i)
3082 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3711 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3083 } 3712 }
3084} 3713}
3085 3714
3715MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3716
3717void
3718_may_delete (SV *sem, int count, int extra_refs)
3719 PPCODE:
3720{
3721 AV *av = (AV *)SvRV (sem);
3722
3723 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3724 && AvFILLp (av) == 0 /* no waiters, just count */
3725 && SvIV (AvARRAY (av)[0]) == count)
3726 XSRETURN_YES;
3727
3728 XSRETURN_NO;
3729}
3730
3086MODULE = Coro::State PACKAGE = Coro::Signal 3731MODULE = Coro::State PACKAGE = Coro::Signal
3087 3732
3088SV * 3733SV *
3089new (SV *klass) 3734new (SV *klass)
3090 CODE: 3735 CODE:
… …
3094 ); 3739 );
3095 OUTPUT: 3740 OUTPUT:
3096 RETVAL 3741 RETVAL
3097 3742
3098void 3743void
3099wait (SV *self) 3744wait (...)
3100 CODE: 3745 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3746 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3747
3103void 3748void
3104broadcast (SV *self) 3749broadcast (SV *self)
… …
3161 3806
3162void 3807void
3163_register (char *target, char *proto, SV *req) 3808_register (char *target, char *proto, SV *req)
3164 CODE: 3809 CODE:
3165{ 3810{
3166 HV *st; 3811 CV *req_cv = coro_sv_2cv (aTHX_ req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3812 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3813 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3814 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3815 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3816}

Diff Legend

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