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.288 by root, Mon Nov 17 07:14:50 2008 UTC vs.
Revision 1.349 by root, Wed Jun 10 00:47:24 2009 UTC

… …
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
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
… …
120#endif 126#endif
121 127
122/* The next macros try to return the current stack pointer, in an as 128/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 129 * portable way as possible. */
124#if __GNUC__ >= 4 130#if __GNUC__ >= 4
131# define dSTACKLEVEL int stacklevel_dummy
125# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 132# define STACKLEVEL __builtin_frame_address (0)
126#else 133#else
127# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel)
128#endif 136#endif
129 137
130#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
131 139
132#if __GNUC__ >= 3 140#if __GNUC__ >= 3
133# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
134# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
135# define INLINE static inline 143# define INLINE static inline
… …
143#define expect_true(expr) expect ((expr) != 0, 1) 151#define expect_true(expr) expect ((expr) != 0, 1)
144 152
145#define NOINLINE attribute ((noinline)) 153#define NOINLINE attribute ((noinline))
146 154
147#include "CoroAPI.h" 155#include "CoroAPI.h"
156#define GCoroAPI (&coroapi) /* very sneaky */
148 157
149#ifdef USE_ITHREADS 158#ifdef USE_ITHREADS
150# if CORO_PTHREAD 159# if CORO_PTHREAD
151static void *coro_thx; 160static void *coro_thx;
152# endif 161# endif
153#endif 162#endif
154 163
155static double (*nvtime)(); /* so why doesn't it take void? */ 164static double (*nvtime)(); /* so why doesn't it take void? */
165
166/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX);
156 169
157static U32 cctx_gen; 170static U32 cctx_gen;
158static size_t cctx_stacksize = CORO_STACKSIZE; 171static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 172static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 173static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 174static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 175static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 177
178static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */
180static SV *sv_idle; /* $Coro::idle */
181
165static GV *irsgv; /* $/ */ 182static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 183static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 184static SV *rv_diehook;
168static SV *rv_warnhook; 185static SV *rv_warnhook;
169static HV *hv_sig; /* %SIG */ 186static HV *hv_sig; /* %SIG */
170 187
171/* async_pool helper stuff */ 188/* async_pool helper stuff */
172static SV *sv_pool_rss; 189static SV *sv_pool_rss;
173static SV *sv_pool_size; 190static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */
174static AV *av_async_pool; 192static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
175 196
176/* Coro::AnyEvent */ 197/* Coro::AnyEvent */
177static SV *sv_activity; 198static SV *sv_activity;
178 199
179static struct coro_cctx *cctx_first; 200static struct coro_cctx *cctx_first;
… …
208 int valgrind_id; 229 int valgrind_id;
209#endif 230#endif
210 unsigned char flags; 231 unsigned char flags;
211} coro_cctx; 232} coro_cctx;
212 233
234coro_cctx *cctx_current; /* the currently running cctx */
235
236/*****************************************************************************/
237
213enum { 238enum {
214 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
215 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
216 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
217 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
218}; 244};
219 245
220/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
221typedef struct 247typedef struct
222{ 248{
223 SV *defsv; 249 SV *defsv;
224 AV *defav; 250 AV *defav;
225 SV *errsv; 251 SV *errsv;
226 SV *irsgv; 252 SV *irsgv;
253 HV *hinthv;
227#define VAR(name,type) type name; 254#define VAR(name,type) type name;
228# include "state.h" 255# include "state.h"
229#undef VAR 256#undef VAR
230} perl_slots; 257} perl_slots;
231 258
… …
234/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
235struct coro { 262struct coro {
236 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
237 coro_cctx *cctx; 264 coro_cctx *cctx;
238 265
266 /* ready queue */
267 struct coro *next_ready;
268
239 /* state data */ 269 /* state data */
240 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
241 AV *mainstack; 271 AV *mainstack;
242 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
243 273
274 CV *startcv; /* the CV to execute */
244 AV *args; /* data associated with this coroutine (initial args) */ 275 AV *args; /* data associated with this coroutine (initial args) */
245 int refcnt; /* coroutines are refcounted, yes */ 276 int refcnt; /* coroutines are refcounted, yes */
246 int flags; /* CF_ flags */ 277 int flags; /* CF_ flags */
247 HV *hv; /* the perl hash associated with this coro, if any */ 278 HV *hv; /* the perl hash associated with this coro, if any */
248 void (*on_destroy)(pTHX_ struct coro *coro); 279 void (*on_destroy)(pTHX_ struct coro *coro);
249 280
250 /* statistics */ 281 /* statistics */
251 int usecount; /* number of transfers to this coro */ 282 int usecount; /* number of transfers to this coro */
252 283
253 /* coro process data */ 284 /* coro process data */
254 int prio; 285 int prio;
255 SV *throw; /* exception to be thrown */ 286 SV *except; /* exception to be thrown */
287 SV *rouse_cb;
256 288
257 /* async_pool */ 289 /* async_pool */
258 SV *saved_deffh; 290 SV *saved_deffh;
291 SV *invoke_cb;
292 AV *invoke_av;
293
294 /* on_enter/on_leave */
295 AV *on_enter;
296 AV *on_leave;
259 297
260 /* linked list */ 298 /* linked list */
261 struct coro *next, *prev; 299 struct coro *next, *prev;
262}; 300};
263 301
… …
266 304
267/* the following variables are effectively part of the perl context */ 305/* the following variables are effectively part of the perl context */
268/* and get copied between struct coro and these variables */ 306/* and get copied between struct coro and these variables */
269/* the mainr easonw e don't support windows process emulation */ 307/* the mainr easonw e don't support windows process emulation */
270static struct CoroSLF slf_frame; /* the current slf frame */ 308static struct CoroSLF slf_frame; /* the current slf frame */
271static SV *coro_throw;
272 309
273/** Coro ********************************************************************/ 310/** Coro ********************************************************************/
274 311
275#define PRIO_MAX 3 312#define PRIO_MAX 3
276#define PRIO_HIGH 1 313#define PRIO_HIGH 1
… …
280#define PRIO_MIN -4 317#define PRIO_MIN -4
281 318
282/* for Coro.pm */ 319/* for Coro.pm */
283static SV *coro_current; 320static SV *coro_current;
284static SV *coro_readyhook; 321static SV *coro_readyhook;
285static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate;
286static struct coro *coro_first; 324static struct coro *coro_first;
287#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
288 326
289/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
290 328
… …
316 get_hv (name, create); 354 get_hv (name, create);
317#endif 355#endif
318 return get_hv (name, create); 356 return get_hv (name, create);
319} 357}
320 358
359/* may croak */
360INLINE CV *
361coro_sv_2cv (pTHX_ SV *sv)
362{
363 HV *st;
364 GV *gvp;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
371}
372
373/*****************************************************************************/
374/* magic glue */
375
376#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext
378
379#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \
382 : mg_find (sv, type))
383
384#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \
387 : 0)
388
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391
392INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro)
394{
395 HV *stash;
396 MAGIC *mg;
397
398 if (SvROK (coro))
399 coro = SvRV (coro);
400
401 if (expect_false (SvTYPE (coro) != SVt_PVHV))
402 croak ("Coro::State object required");
403
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr;
414}
415
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417
418/* faster than SvSTATE, but expects a coroutine hv */
419#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421
422/*****************************************************************************/
423/* padlist management and caching */
424
321static AV * 425static AV *
322coro_clone_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
323{ 427{
324 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
325 AV *newpadlist, *newpad; 429 AV *newpadlist, *newpad;
326 430
327 newpadlist = newAV (); 431 newpadlist = newAV ();
… …
332 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
333#endif 437#endif
334 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
335 --AvFILLp (padlist); 439 --AvFILLp (padlist);
336 440
337 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
338 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
339 443
340 return newpadlist; 444 return newpadlist;
341} 445}
342 446
343static void 447static void
344free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
345{ 449{
346 /* may be during global destruction */ 450 /* may be during global destruction */
347 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
348 { 452 {
349 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
350 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
351 { 456 {
352 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
353 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
354 { 459 I32 j = AvFILLp (av);
355 SV *sv; 460
356 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
357 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
358
359 SvREFCNT_dec (*svp);
360 }
361 } 466 }
362 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
363 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
364 } 472 }
365} 473}
366 474
367static int 475static int
… …
376 484
377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
378 486
379 return 0; 487 return 0;
380} 488}
381
382#define CORO_MAGIC_type_cv 26
383#define CORO_MAGIC_type_state PERL_MAGIC_ext
384 489
385static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
386 0, 0, 0, 0, 491 0, 0, 0, 0,
387 coro_cv_free 492 coro_cv_free
388}; 493};
389
390#define CORO_MAGIC_NN(sv, type) \
391 (expect_true (SvMAGIC (sv)->mg_type == type) \
392 ? SvMAGIC (sv) \
393 : mg_find (sv, type))
394
395#define CORO_MAGIC(sv, type) \
396 (expect_true (SvMAGIC (sv)) \
397 ? CORO_MAGIC_NN (sv, type) \
398 : 0)
399
400#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
401#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
402
403INLINE struct coro *
404SvSTATE_ (pTHX_ SV *coro)
405{
406 HV *stash;
407 MAGIC *mg;
408
409 if (SvROK (coro))
410 coro = SvRV (coro);
411
412 if (expect_false (SvTYPE (coro) != SVt_PVHV))
413 croak ("Coro::State object required");
414
415 stash = SvSTASH (coro);
416 if (expect_false (stash != coro_stash && stash != coro_state_stash))
417 {
418 /* very slow, but rare, check */
419 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
420 croak ("Coro::State object required");
421 }
422
423 mg = CORO_MAGIC_state (coro);
424 return (struct coro *)mg->mg_ptr;
425}
426
427#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
428
429/* faster than SvSTATE, but expects a coroutine hv */
430#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
431#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
432 494
433/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
434static void 496static void
435get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
436{ 498{
… …
442 else 504 else
443 { 505 {
444#if CORO_PREFER_PERL_FUNCTIONS 506#if CORO_PREFER_PERL_FUNCTIONS
445 /* this is probably cleaner? but also slower! */ 507 /* this is probably cleaner? but also slower! */
446 /* in practise, it seems to be less stable */ 508 /* in practise, it seems to be less stable */
447 CV *cp = Perl_cv_clone (cv); 509 CV *cp = Perl_cv_clone (aTHX_ cv);
448 CvPADLIST (cv) = CvPADLIST (cp); 510 CvPADLIST (cv) = CvPADLIST (cp);
449 CvPADLIST (cp) = 0; 511 CvPADLIST (cp) = 0;
450 SvREFCNT_dec (cp); 512 SvREFCNT_dec (cp);
451#else 513#else
452 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 514 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
453#endif 515#endif
454 } 516 }
455} 517}
456 518
457static void 519static void
… …
464 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
465 527
466 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
467 529
468 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
469 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
470 532
471 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
472} 534}
473 535
474/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
475 540
476static void 541static void
477load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
478{ 543{
479 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
480 c->slot = 0; 545 c->slot = 0;
481 546
482 PL_mainstack = c->mainstack; 547 PL_mainstack = c->mainstack;
483 548
484 GvSV (PL_defgv) = slot->defsv; 549 GvSV (PL_defgv) = slot->defsv;
485 GvAV (PL_defgv) = slot->defav; 550 GvAV (PL_defgv) = slot->defav;
486 GvSV (PL_errgv) = slot->errsv; 551 GvSV (PL_errgv) = slot->errsv;
487 GvSV (irsgv) = slot->irsgv; 552 GvSV (irsgv) = slot->irsgv;
553 GvHV (PL_hintgv) = slot->hinthv;
488 554
489 #define VAR(name,type) PL_ ## name = slot->name; 555 #define VAR(name,type) PL_ ## name = slot->name;
490 # include "state.h" 556 # include "state.h"
491 #undef VAR 557 #undef VAR
492 558
… …
505 571
506 PUTBACK; 572 PUTBACK;
507 } 573 }
508 574
509 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
510 coro_throw = c->throw; 576 CORO_THROW = c->except;
577
578 if (expect_false (c->on_enter))
579 {
580 int i;
581
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 }
511} 585}
512 586
513static void 587static void
514save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
515{ 589{
516 c->throw = coro_throw; 590 if (expect_false (c->on_leave))
591 {
592 int i;
593
594 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
596 }
597
598 c->except = CORO_THROW;
517 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
518 600
519 { 601 {
520 dSP; 602 dSP;
521 I32 cxix = cxstack_ix; 603 I32 cxix = cxstack_ix;
… …
578 c->mainstack = PL_mainstack; 660 c->mainstack = PL_mainstack;
579 661
580 { 662 {
581 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
582 664
583 slot->defav = GvAV (PL_defgv); 665 slot->defav = GvAV (PL_defgv);
584 slot->defsv = DEFSV; 666 slot->defsv = DEFSV;
585 slot->errsv = ERRSV; 667 slot->errsv = ERRSV;
586 slot->irsgv = GvSV (irsgv); 668 slot->irsgv = GvSV (irsgv);
669 slot->hinthv = GvHV (PL_hintgv);
587 670
588 #define VAR(name,type) slot->name = PL_ ## name; 671 #define VAR(name,type) slot->name = PL_ ## name;
589 # include "state.h" 672 # include "state.h"
590 #undef VAR 673 #undef VAR
591 } 674 }
… …
596 * of perl.c:init_stacks, except that it uses less memory 679 * of perl.c:init_stacks, except that it uses less memory
597 * on the (sometimes correct) assumption that coroutines do 680 * on the (sometimes correct) assumption that coroutines do
598 * not usually need a lot of stackspace. 681 * not usually need a lot of stackspace.
599 */ 682 */
600#if CORO_PREFER_PERL_FUNCTIONS 683#if CORO_PREFER_PERL_FUNCTIONS
601# define coro_init_stacks init_stacks 684# define coro_init_stacks(thx) init_stacks ()
602#else 685#else
603static void 686static void
604coro_init_stacks (pTHX) 687coro_init_stacks (pTHX)
605{ 688{
606 PL_curstackinfo = new_stackinfo(32, 8); 689 PL_curstackinfo = new_stackinfo(32, 8);
… …
669#if !PERL_VERSION_ATLEAST (5,10,0) 752#if !PERL_VERSION_ATLEAST (5,10,0)
670 Safefree (PL_retstack); 753 Safefree (PL_retstack);
671#endif 754#endif
672} 755}
673 756
757#define CORO_RSS \
758 rss += sizeof (SYM (curstackinfo)); \
759 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
760 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
761 rss += SYM (tmps_max) * sizeof (SV *); \
762 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
763 rss += SYM (scopestack_max) * sizeof (I32); \
764 rss += SYM (savestack_max) * sizeof (ANY);
765
674static size_t 766static size_t
675coro_rss (pTHX_ struct coro *coro) 767coro_rss (pTHX_ struct coro *coro)
676{ 768{
677 size_t rss = sizeof (*coro); 769 size_t rss = sizeof (*coro);
678 770
679 if (coro->mainstack) 771 if (coro->mainstack)
680 { 772 {
681 perl_slots tmp_slot;
682 perl_slots *slot;
683
684 if (coro->flags & CF_RUNNING) 773 if (coro->flags & CF_RUNNING)
685 { 774 {
686 slot = &tmp_slot; 775 #define SYM(sym) PL_ ## sym
687 776 CORO_RSS;
688 #define VAR(name,type) slot->name = PL_ ## name;
689 # include "state.h"
690 #undef VAR 777 #undef SYM
691 } 778 }
692 else 779 else
693 slot = coro->slot;
694
695 if (slot)
696 { 780 {
697 rss += sizeof (slot->curstackinfo); 781 #define SYM(sym) coro->slot->sym
698 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 782 CORO_RSS;
699 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 783 #undef SYM
700 rss += slot->tmps_max * sizeof (SV *);
701 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
702 rss += slot->scopestack_max * sizeof (I32);
703 rss += slot->savestack_max * sizeof (ANY);
704
705#if !PERL_VERSION_ATLEAST (5,10,0)
706 rss += slot->retstack_max * sizeof (OP *);
707#endif
708 } 784 }
709 } 785 }
710 786
711 return rss; 787 return rss;
712} 788}
… …
725#endif 801#endif
726 802
727/* 803/*
728 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
729 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
730 * and instead of tryign to save and restore the hash elements, we just provide 806 * and instead of trying to save and restore the hash elements, we just provide
731 * readback here. 807 * readback here.
732 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
733 * not expecting this to actually change the hook. This is a potential problem
734 * when a schedule happens then, but we ignore this.
735 */ 808 */
736static int 809static int
737coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
738{ 811{
739 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
… …
792 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
793 866
794 if (svp) 867 if (svp)
795 { 868 {
796 SV *old = *svp; 869 SV *old = *svp;
797 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
798 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
799 return 0; 872 return 0;
800 } 873 }
801 } 874 }
802 875
… …
813static int 886static int
814slf_check_nop (pTHX_ struct CoroSLF *frame) 887slf_check_nop (pTHX_ struct CoroSLF *frame)
815{ 888{
816 return 0; 889 return 0;
817} 890}
891
892static int
893slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{
895 return 1;
896}
897
898static UNOP coro_setup_op;
818 899
819static void NOINLINE /* noinline to keep it out of the transfer fast path */ 900static void NOINLINE /* noinline to keep it out of the transfer fast path */
820coro_setup (pTHX_ struct coro *coro) 901coro_setup (pTHX_ struct coro *coro)
821{ 902{
822 /* 903 /*
… …
826 907
827 PL_runops = RUNOPS_DEFAULT; 908 PL_runops = RUNOPS_DEFAULT;
828 PL_curcop = &PL_compiling; 909 PL_curcop = &PL_compiling;
829 PL_in_eval = EVAL_NULL; 910 PL_in_eval = EVAL_NULL;
830 PL_comppad = 0; 911 PL_comppad = 0;
912 PL_comppad_name = 0;
913 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0;
831 PL_curpm = 0; 915 PL_curpm = 0;
832 PL_curpad = 0; 916 PL_curpad = 0;
833 PL_localizing = 0; 917 PL_localizing = 0;
834 PL_dirty = 0; 918 PL_dirty = 0;
835 PL_restartop = 0; 919 PL_restartop = 0;
836#if PERL_VERSION_ATLEAST (5,10,0) 920#if PERL_VERSION_ATLEAST (5,10,0)
837 PL_parser = 0; 921 PL_parser = 0;
838#endif 922#endif
923 PL_hints = 0;
839 924
840 /* recreate the die/warn hooks */ 925 /* recreate the die/warn hooks */
841 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
842 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
843 928
844 GvSV (PL_defgv) = newSV (0); 929 GvSV (PL_defgv) = newSV (0);
845 GvAV (PL_defgv) = coro->args; coro->args = 0; 930 GvAV (PL_defgv) = coro->args; coro->args = 0;
846 GvSV (PL_errgv) = newSV (0); 931 GvSV (PL_errgv) = newSV (0);
847 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
933 GvHV (PL_hintgv) = 0;
848 PL_rs = newSVsv (GvSV (irsgv)); 934 PL_rs = newSVsv (GvSV (irsgv));
849 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 935 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
850 936
851 { 937 {
852 dSP; 938 dSP;
853 UNOP myop; 939 UNOP myop;
854 940
855 Zero (&myop, 1, UNOP); 941 Zero (&myop, 1, UNOP);
856 myop.op_next = Nullop; 942 myop.op_next = Nullop;
943 myop.op_type = OP_ENTERSUB;
857 myop.op_flags = OPf_WANT_VOID; 944 myop.op_flags = OPf_WANT_VOID;
858 945
859 PUSHMARK (SP); 946 PUSHMARK (SP);
860 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 947 PUSHs ((SV *)coro->startcv);
861 PUTBACK; 948 PUTBACK;
862 PL_op = (OP *)&myop; 949 PL_op = (OP *)&myop;
863 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 950 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
864 SPAGAIN;
865 } 951 }
866 952
867 /* this newly created coroutine might be run on an existing cctx which most 953 /* this newly created coroutine might be run on an existing cctx which most
868 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
869 */ 955 */
870 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
871 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
872 958
873 coro_throw = coro->throw; 959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
874} 960 coro_setup_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */
875 964
965 PL_op = (OP *)&coro_setup_op;
966
967 /* copy throw, in case it was set before coro_setup */
968 CORO_THROW = coro->except;
969}
970
876static void 971static void
877coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
878{ 973{
879 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
880 { 975 {
881 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
882 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
… …
890 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
891 986
892 /* unwind main stack */ 987 /* unwind main stack */
893 dounwind (-1); 988 dounwind (-1);
894 } 989 }
990}
991
992static void
993coro_destruct_perl (pTHX_ struct coro *coro)
994{
995 coro_unwind_stacks (aTHX);
895 996
896 SvREFCNT_dec (GvSV (PL_defgv)); 997 SvREFCNT_dec (GvSV (PL_defgv));
897 SvREFCNT_dec (GvAV (PL_defgv)); 998 SvREFCNT_dec (GvAV (PL_defgv));
898 SvREFCNT_dec (GvSV (PL_errgv)); 999 SvREFCNT_dec (GvSV (PL_errgv));
899 SvREFCNT_dec (PL_defoutgv); 1000 SvREFCNT_dec (PL_defoutgv);
900 SvREFCNT_dec (PL_rs); 1001 SvREFCNT_dec (PL_rs);
901 SvREFCNT_dec (GvSV (irsgv)); 1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
902 1004
903 SvREFCNT_dec (PL_diehook); 1005 SvREFCNT_dec (PL_diehook);
904 SvREFCNT_dec (PL_warnhook); 1006 SvREFCNT_dec (PL_warnhook);
905 1007
906 SvREFCNT_dec (coro->saved_deffh); 1008 SvREFCNT_dec (coro->saved_deffh);
907 SvREFCNT_dec (coro_throw); 1009 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av);
908 1012
909 coro_destruct_stacks (aTHX); 1013 coro_destruct_stacks (aTHX);
910} 1014}
911 1015
912INLINE void 1016INLINE void
… …
922static int 1026static int
923runops_trace (pTHX) 1027runops_trace (pTHX)
924{ 1028{
925 COP *oldcop = 0; 1029 COP *oldcop = 0;
926 int oldcxix = -2; 1030 int oldcxix = -2;
927 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
928 coro_cctx *cctx = coro->cctx;
929 1031
930 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1032 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
931 { 1033 {
932 PERL_ASYNC_CHECK (); 1034 PERL_ASYNC_CHECK ();
933 1035
934 if (cctx->flags & CC_TRACE_ALL) 1036 if (cctx_current->flags & CC_TRACE_ALL)
935 { 1037 {
936 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1038 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
937 { 1039 {
938 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1040 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
939 SV **bot, **top; 1041 SV **bot, **top;
940 AV *av = newAV (); /* return values */ 1042 AV *av = newAV (); /* return values */
941 SV **cb; 1043 SV **cb;
… …
978 1080
979 if (PL_curcop != &PL_compiling) 1081 if (PL_curcop != &PL_compiling)
980 { 1082 {
981 SV **cb; 1083 SV **cb;
982 1084
983 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1085 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
984 { 1086 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1087 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 1088
987 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1089 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
988 { 1090 {
989 runops_proc_t old_runops = PL_runops;
990 dSP; 1091 dSP;
991 GV *gv = CvGV (cx->blk_sub.cv); 1092 GV *gv = CvGV (cx->blk_sub.cv);
992 SV *fullname = sv_2mortal (newSV (0)); 1093 SV *fullname = sv_2mortal (newSV (0));
993 1094
994 if (isGV (gv)) 1095 if (isGV (gv))
… …
999 SAVETMPS; 1100 SAVETMPS;
1000 EXTEND (SP, 3); 1101 EXTEND (SP, 3);
1001 PUSHMARK (SP); 1102 PUSHMARK (SP);
1002 PUSHs (&PL_sv_yes); 1103 PUSHs (&PL_sv_yes);
1003 PUSHs (fullname); 1104 PUSHs (fullname);
1004 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1105 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1005 PUTBACK; 1106 PUTBACK;
1006 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1107 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1007 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1108 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1008 SPAGAIN; 1109 SPAGAIN;
1009 FREETMPS; 1110 FREETMPS;
… …
1012 } 1113 }
1013 1114
1014 oldcxix = cxstack_ix; 1115 oldcxix = cxstack_ix;
1015 } 1116 }
1016 1117
1017 if (cctx->flags & CC_TRACE_LINE) 1118 if (cctx_current->flags & CC_TRACE_LINE)
1018 { 1119 {
1019 dSP; 1120 dSP;
1020 1121
1021 PL_runops = RUNOPS_DEFAULT; 1122 PL_runops = RUNOPS_DEFAULT;
1022 ENTER; 1123 ENTER;
… …
1041 1142
1042 TAINT_NOT; 1143 TAINT_NOT;
1043 return 0; 1144 return 0;
1044} 1145}
1045 1146
1147static struct CoroSLF cctx_ssl_frame;
1148
1046static void 1149static void
1047prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx) 1150slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1048{ 1151{
1049 ta->prev = (struct coro *)cctx;
1050 ta->next = 0; 1152 ta->prev = 0;
1051} 1153}
1052 1154
1053/* inject a fake call to Coro::State::_cctx_init into the execution */ 1155static int
1054/* _cctx_init should be careful, as it could be called at almost any time */ 1156slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1055/* during execution of a perl program */ 1157{
1056/* also initialises PL_top_env */ 1158 *frame = cctx_ssl_frame;
1159
1160 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1161}
1162
1163/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1057static void NOINLINE 1164static void NOINLINE
1058cctx_prepare (pTHX_ coro_cctx *cctx) 1165cctx_prepare (pTHX)
1059{ 1166{
1060 dSP;
1061 UNOP myop;
1062
1063 PL_top_env = &PL_start_env; 1167 PL_top_env = &PL_start_env;
1064 1168
1065 if (cctx->flags & CC_TRACE) 1169 if (cctx_current->flags & CC_TRACE)
1066 PL_runops = runops_trace; 1170 PL_runops = runops_trace;
1067 1171
1068 Zero (&myop, 1, UNOP); 1172 /* we already must be executing an SLF op, there is no other valid way
1069 myop.op_next = PL_op; 1173 * that can lead to creation of a new cctx */
1070 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1174 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1175 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1071 1176
1072 PUSHMARK (SP); 1177 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1073 EXTEND (SP, 2); 1178 cctx_ssl_frame = slf_frame;
1074 PUSHs (sv_2mortal (newSViv ((IV)cctx))); 1179
1075 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1180 slf_frame.prepare = slf_prepare_set_stacklevel;
1076 PUTBACK; 1181 slf_frame.check = slf_check_set_stacklevel;
1077 PL_op = (OP *)&myop;
1078 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1079 SPAGAIN;
1080} 1182}
1081 1183
1082/* the tail of transfer: execute stuff we can only do after a transfer */ 1184/* the tail of transfer: execute stuff we can only do after a transfer */
1083INLINE void 1185INLINE void
1084transfer_tail (pTHX) 1186transfer_tail (pTHX)
… …
1103 /* normally we would need to skip the entersub here */ 1205 /* normally we would need to skip the entersub here */
1104 /* not doing so will re-execute it, which is exactly what we want */ 1206 /* not doing so will re-execute it, which is exactly what we want */
1105 /* PL_nop = PL_nop->op_next */ 1207 /* PL_nop = PL_nop->op_next */
1106 1208
1107 /* inject a fake subroutine call to cctx_init */ 1209 /* inject a fake subroutine call to cctx_init */
1108 cctx_prepare (aTHX_ (coro_cctx *)arg); 1210 cctx_prepare (aTHX);
1109 1211
1110 /* cctx_run is the alternative tail of transfer() */ 1212 /* cctx_run is the alternative tail of transfer() */
1111 transfer_tail (aTHX); 1213 transfer_tail (aTHX);
1112 1214
1113 /* somebody or something will hit me for both perl_run and PL_restartop */ 1215 /* somebody or something will hit me for both perl_run and PL_restartop */
1114 PL_restartop = PL_op; 1216 PL_restartop = PL_op;
1115 perl_run (PL_curinterp); 1217 perl_run (PL_curinterp);
1218 /*
1219 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these
1221 */
1116 1222
1117 /* 1223 /*
1118 * If perl-run returns we assume exit() was being called or the coro 1224 * If perl-run returns we assume exit() was being called or the coro
1119 * fell off the end, which seems to be the only valid (non-bug) 1225 * fell off the end, which seems to be the only valid (non-bug)
1120 * reason for perl_run to return. We try to exit by jumping to the 1226 * reason for perl_run to return. We try to exit by jumping to the
1121 * bootstrap-time "top" top_env, as we cannot restore the "main" 1227 * bootstrap-time "top" top_env, as we cannot restore the "main"
1122 * coroutine as Coro has no such concept 1228 * coroutine as Coro has no such concept.
1229 * This actually isn't valid with the pthread backend, but OSes requiring
1230 * that backend are too broken to do it in a standards-compliant way.
1123 */ 1231 */
1124 PL_top_env = main_top_env; 1232 PL_top_env = main_top_env;
1125 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1233 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1126 } 1234 }
1127} 1235}
… …
1204cctx_destroy (coro_cctx *cctx) 1312cctx_destroy (coro_cctx *cctx)
1205{ 1313{
1206 if (!cctx) 1314 if (!cctx)
1207 return; 1315 return;
1208 1316
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1318
1209 --cctx_count; 1319 --cctx_count;
1210 coro_destroy (&cctx->cctx); 1320 coro_destroy (&cctx->cctx);
1211 1321
1212 /* coro_transfer creates new, empty cctx's */ 1322 /* coro_transfer creates new, empty cctx's */
1213 if (cctx->sptr) 1323 if (cctx->sptr)
… …
1276 /* TODO: throwing up here is considered harmful */ 1386 /* TODO: throwing up here is considered harmful */
1277 1387
1278 if (expect_true (prev != next)) 1388 if (expect_true (prev != next))
1279 { 1389 {
1280 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1390 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1281 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1282 1392
1283 if (expect_false (next->flags & CF_RUNNING))
1284 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1285
1286 if (expect_false (next->flags & CF_DESTROYED)) 1393 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1287 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1288 1395
1289#if !PERL_VERSION_ATLEAST (5,10,0) 1396#if !PERL_VERSION_ATLEAST (5,10,0)
1290 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1397 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1291 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1292#endif 1399#endif
… …
1298transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1405transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1299{ 1406{
1300 dSTACKLEVEL; 1407 dSTACKLEVEL;
1301 1408
1302 /* sometimes transfer is only called to set idle_sp */ 1409 /* sometimes transfer is only called to set idle_sp */
1303 if (expect_false (!next)) 1410 if (expect_false (!prev))
1304 { 1411 {
1305 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1412 cctx_current->idle_sp = STACKLEVEL;
1306 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1413 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1307 } 1414 }
1308 else if (expect_true (prev != next)) 1415 else if (expect_true (prev != next))
1309 { 1416 {
1310 coro_cctx *prev__cctx; 1417 coro_cctx *cctx_prev;
1311 1418
1312 if (expect_false (prev->flags & CF_NEW)) 1419 if (expect_false (prev->flags & CF_NEW))
1313 { 1420 {
1314 /* create a new empty/source context */ 1421 /* create a new empty/source context */
1315 prev->cctx = cctx_new_empty ();
1316 prev->flags &= ~CF_NEW; 1422 prev->flags &= ~CF_NEW;
1317 prev->flags |= CF_RUNNING; 1423 prev->flags |= CF_RUNNING;
1318 } 1424 }
1319 1425
1320 prev->flags &= ~CF_RUNNING; 1426 prev->flags &= ~CF_RUNNING;
… …
1331 coro_setup (aTHX_ next); 1437 coro_setup (aTHX_ next);
1332 } 1438 }
1333 else 1439 else
1334 load_perl (aTHX_ next); 1440 load_perl (aTHX_ next);
1335 1441
1336 prev__cctx = prev->cctx;
1337
1338 /* possibly untie and reuse the cctx */ 1442 /* possibly untie and reuse the cctx */
1339 if (expect_true ( 1443 if (expect_true (
1340 prev__cctx->idle_sp == (void *)stacklevel 1444 cctx_current->idle_sp == STACKLEVEL
1341 && !(prev__cctx->flags & CC_TRACE) 1445 && !(cctx_current->flags & CC_TRACE)
1342 && !force_cctx 1446 && !force_cctx
1343 )) 1447 ))
1344 { 1448 {
1345 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1449 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1346 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1450 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1347 1451
1348 prev->cctx = 0;
1349
1350 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1452 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1351 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1453 /* without this the next cctx_get might destroy the running cctx while still in use */
1352 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1454 if (expect_false (CCTX_EXPIRED (cctx_current)))
1353 if (!next->cctx) 1455 if (expect_true (!next->cctx))
1354 next->cctx = cctx_get (aTHX); 1456 next->cctx = cctx_get (aTHX);
1355 1457
1356 cctx_put (prev__cctx); 1458 cctx_put (cctx_current);
1357 } 1459 }
1460 else
1461 prev->cctx = cctx_current;
1358 1462
1359 ++next->usecount; 1463 ++next->usecount;
1360 1464
1361 if (expect_true (!next->cctx)) 1465 cctx_prev = cctx_current;
1362 next->cctx = cctx_get (aTHX); 1466 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1363 1467
1364 if (expect_false (prev__cctx != next->cctx)) 1468 next->cctx = 0;
1469
1470 if (expect_false (cctx_prev != cctx_current))
1365 { 1471 {
1366 prev__cctx->top_env = PL_top_env; 1472 cctx_prev->top_env = PL_top_env;
1367 PL_top_env = next->cctx->top_env; 1473 PL_top_env = cctx_current->top_env;
1368 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1474 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1369 } 1475 }
1370 1476
1371 transfer_tail (aTHX); 1477 transfer_tail (aTHX);
1372 } 1478 }
1373} 1479}
… …
1381coro_state_destroy (pTHX_ struct coro *coro) 1487coro_state_destroy (pTHX_ struct coro *coro)
1382{ 1488{
1383 if (coro->flags & CF_DESTROYED) 1489 if (coro->flags & CF_DESTROYED)
1384 return 0; 1490 return 0;
1385 1491
1386 if (coro->on_destroy) 1492 if (coro->on_destroy && !PL_dirty)
1387 coro->on_destroy (aTHX_ coro); 1493 coro->on_destroy (aTHX_ coro);
1388 1494
1389 coro->flags |= CF_DESTROYED; 1495 coro->flags |= CF_DESTROYED;
1390 1496
1391 if (coro->flags & CF_READY) 1497 if (coro->flags & CF_READY)
… …
1395 --coro_nready; 1501 --coro_nready;
1396 } 1502 }
1397 else 1503 else
1398 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1399 1505
1400 if (coro->mainstack && coro->mainstack != main_mainstack) 1506 if (coro->mainstack
1507 && coro->mainstack != main_mainstack
1508 && coro->slot
1509 && !PL_dirty)
1401 { 1510 {
1402 struct coro temp; 1511 struct coro *current = SvSTATE_current;
1403 1512
1404 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1405 1514
1406 save_perl (aTHX_ &temp); 1515 save_perl (aTHX_ current);
1407 load_perl (aTHX_ coro); 1516 load_perl (aTHX_ coro);
1408 1517
1409 coro_destruct (aTHX_ coro); 1518 coro_destruct_perl (aTHX_ coro);
1410 1519
1411 load_perl (aTHX_ &temp); 1520 load_perl (aTHX_ current);
1412 1521
1413 coro->slot = 0; 1522 coro->slot = 0;
1414 } 1523 }
1415 1524
1416 cctx_destroy (coro->cctx); 1525 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv);
1417 SvREFCNT_dec (coro->args); 1527 SvREFCNT_dec (coro->args);
1528 SvREFCNT_dec (CORO_THROW);
1418 1529
1419 if (coro->next) coro->next->prev = coro->prev; 1530 if (coro->next) coro->next->prev = coro->prev;
1420 if (coro->prev) coro->prev->next = coro->next; 1531 if (coro->prev) coro->prev->next = coro->next;
1421 if (coro == coro_first) coro_first = coro->next; 1532 if (coro == coro_first) coro_first = coro->next;
1422 1533
… …
1476 1587
1477 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1478 TRANSFER (ta, 1); 1589 TRANSFER (ta, 1);
1479} 1590}
1480 1591
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1481/** Coro ********************************************************************/ 1615/** Coro ********************************************************************/
1482 1616
1483INLINE void 1617INLINE void
1484coro_enq (pTHX_ struct coro *coro) 1618coro_enq (pTHX_ struct coro *coro)
1485{ 1619{
1486 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1487}
1488 1621
1489INLINE SV * 1622 SvREFCNT_inc_NN (coro->hv);
1623
1624 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1626 ready [1] = coro;
1627}
1628
1629INLINE struct coro *
1490coro_deq (pTHX) 1630coro_deq (pTHX)
1491{ 1631{
1492 int prio; 1632 int prio;
1493 1633
1494 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1495 if (AvFILLp (coro_ready [prio]) >= 0) 1635 {
1496 return av_shift (coro_ready [prio]); 1636 struct coro **ready = coro_ready [prio];
1637
1638 if (ready [0])
1639 {
1640 struct coro *coro = ready [0];
1641 ready [0] = coro->next_ready;
1642 return coro;
1643 }
1644 }
1497 1645
1498 return 0; 1646 return 0;
1499} 1647}
1500 1648
1501static int 1649static int
… …
1503{ 1651{
1504 struct coro *coro; 1652 struct coro *coro;
1505 SV *sv_hook; 1653 SV *sv_hook;
1506 void (*xs_hook)(void); 1654 void (*xs_hook)(void);
1507 1655
1508 if (SvROK (coro_sv))
1509 coro_sv = SvRV (coro_sv);
1510
1511 coro = SvSTATE (coro_sv); 1656 coro = SvSTATE (coro_sv);
1512 1657
1513 if (coro->flags & CF_READY) 1658 if (coro->flags & CF_READY)
1514 return 0; 1659 return 0;
1515 1660
… …
1528 ENTER; 1673 ENTER;
1529 SAVETMPS; 1674 SAVETMPS;
1530 1675
1531 PUSHMARK (SP); 1676 PUSHMARK (SP);
1532 PUTBACK; 1677 PUTBACK;
1533 call_sv (sv_hook, G_DISCARD); 1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1534 SPAGAIN;
1535 1679
1536 FREETMPS; 1680 FREETMPS;
1537 LEAVE; 1681 LEAVE;
1538 } 1682 }
1539 1683
… …
1547api_is_ready (pTHX_ SV *coro_sv) 1691api_is_ready (pTHX_ SV *coro_sv)
1548{ 1692{
1549 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1693 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1550} 1694}
1551 1695
1696/* expects to own a reference to next->hv */
1552INLINE void 1697INLINE void
1553prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1698prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1554{ 1699{
1555 SV *prev_sv, *next_sv;
1556
1557 for (;;)
1558 {
1559 next_sv = coro_deq (aTHX);
1560
1561 /* nothing to schedule: call the idle handler */
1562 if (expect_false (!next_sv))
1563 {
1564 dSP;
1565
1566 ENTER;
1567 SAVETMPS;
1568
1569 PUSHMARK (SP);
1570 PUTBACK;
1571 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1572 SPAGAIN;
1573
1574 FREETMPS;
1575 LEAVE;
1576 continue;
1577 }
1578
1579 ta->next = SvSTATE_hv (next_sv);
1580
1581 /* cannot transfer to destroyed coros, skip and look for next */
1582 if (expect_false (ta->next->flags & CF_DESTROYED))
1583 {
1584 SvREFCNT_dec (next_sv);
1585 /* coro_nready has already been taken care of by destroy */
1586 continue;
1587 }
1588
1589 --coro_nready;
1590 break;
1591 }
1592
1593 /* free this only after the transfer */
1594 prev_sv = SvRV (coro_current); 1700 SV *prev_sv = SvRV (coro_current);
1701
1595 ta->prev = SvSTATE_hv (prev_sv); 1702 ta->prev = SvSTATE_hv (prev_sv);
1703 ta->next = next;
1704
1596 TRANSFER_CHECK (*ta); 1705 TRANSFER_CHECK (*ta);
1597 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1706
1598 ta->next->flags &= ~CF_READY;
1599 SvRV_set (coro_current, next_sv); 1707 SvRV_set (coro_current, (SV *)next->hv);
1600 1708
1601 free_coro_mortal (aTHX); 1709 free_coro_mortal (aTHX);
1602 coro_mortal = prev_sv; 1710 coro_mortal = prev_sv;
1603} 1711}
1604 1712
1713static void
1714prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1715{
1716 for (;;)
1717 {
1718 struct coro *next = coro_deq (aTHX);
1719
1720 if (expect_true (next))
1721 {
1722 /* cannot transfer to destroyed coros, skip and look for next */
1723 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1724 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1725 else
1726 {
1727 next->flags &= ~CF_READY;
1728 --coro_nready;
1729
1730 prepare_schedule_to (aTHX_ ta, next);
1731 break;
1732 }
1733 }
1734 else
1735 {
1736 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle)))
1739 {
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready;
1743 }
1744 else
1745 {
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (sv_idle, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1757 }
1758 }
1759 }
1760}
1761
1605INLINE void 1762INLINE void
1606prepare_cede (pTHX_ struct coro_transfer_args *ta) 1763prepare_cede (pTHX_ struct coro_transfer_args *ta)
1607{ 1764{
1608 api_ready (aTHX_ coro_current); 1765 api_ready (aTHX_ coro_current);
1609 prepare_schedule (aTHX_ ta); 1766 prepare_schedule (aTHX_ ta);
… …
1628{ 1785{
1629 struct coro_transfer_args ta; 1786 struct coro_transfer_args ta;
1630 1787
1631 prepare_schedule (aTHX_ &ta); 1788 prepare_schedule (aTHX_ &ta);
1632 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1790}
1791
1792static void
1793api_schedule_to (pTHX_ SV *coro_sv)
1794{
1795 struct coro_transfer_args ta;
1796 struct coro *next = SvSTATE (coro_sv);
1797
1798 SvREFCNT_inc_NN (coro_sv);
1799 prepare_schedule_to (aTHX_ &ta, next);
1633} 1800}
1634 1801
1635static int 1802static int
1636api_cede (pTHX) 1803api_cede (pTHX)
1637{ 1804{
… …
1666static void 1833static void
1667api_trace (pTHX_ SV *coro_sv, int flags) 1834api_trace (pTHX_ SV *coro_sv, int flags)
1668{ 1835{
1669 struct coro *coro = SvSTATE (coro_sv); 1836 struct coro *coro = SvSTATE (coro_sv);
1670 1837
1838 if (coro->flags & CF_RUNNING)
1839 croak ("cannot enable tracing on a running coroutine, caught");
1840
1671 if (flags & CC_TRACE) 1841 if (flags & CC_TRACE)
1672 { 1842 {
1673 if (!coro->cctx) 1843 if (!coro->cctx)
1674 coro->cctx = cctx_new_run (); 1844 coro->cctx = cctx_new_run ();
1675 else if (!(coro->cctx->flags & CC_TRACE)) 1845 else if (!(coro->cctx->flags & CC_TRACE))
1676 croak ("cannot enable tracing on coroutine with custom stack,"); 1846 croak ("cannot enable tracing on coroutine with custom stack, caught");
1677 1847
1678 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1848 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1679 } 1849 }
1680 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1850 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1681 { 1851 {
… …
1684 if (coro->flags & CF_RUNNING) 1854 if (coro->flags & CF_RUNNING)
1685 PL_runops = RUNOPS_DEFAULT; 1855 PL_runops = RUNOPS_DEFAULT;
1686 else 1856 else
1687 coro->slot->runops = RUNOPS_DEFAULT; 1857 coro->slot->runops = RUNOPS_DEFAULT;
1688 } 1858 }
1859}
1860
1861static void
1862coro_call_on_destroy (pTHX_ struct coro *coro)
1863{
1864 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1865 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1866
1867 if (on_destroyp)
1868 {
1869 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1870
1871 while (AvFILLp (on_destroy) >= 0)
1872 {
1873 dSP; /* don't disturb outer sp */
1874 SV *cb = av_pop (on_destroy);
1875
1876 PUSHMARK (SP);
1877
1878 if (statusp)
1879 {
1880 int i;
1881 AV *status = (AV *)SvRV (*statusp);
1882 EXTEND (SP, AvFILLp (status) + 1);
1883
1884 for (i = 0; i <= AvFILLp (status); ++i)
1885 PUSHs (AvARRAY (status)[i]);
1886 }
1887
1888 PUTBACK;
1889 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1890 }
1891 }
1892}
1893
1894static void
1895slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1896{
1897 int i;
1898 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV ();
1900
1901 av_extend (av, items - 1);
1902 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i]));
1904
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1906
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager);
1909
1910 frame->prepare = prepare_schedule;
1911 frame->check = slf_check_repeat;
1912
1913 /* as a minor optimisation, we could unwind all stacks here */
1914 /* but that puts extra pressure on pp_slf, and is not worth much */
1915 /*coro_unwind_stacks (aTHX);*/
1916}
1917
1918/*****************************************************************************/
1919/* async pool handler */
1920
1921static int
1922slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1923{
1924 HV *hv = (HV *)SvRV (coro_current);
1925 struct coro *coro = (struct coro *)frame->data;
1926
1927 if (!coro->invoke_cb)
1928 return 1; /* loop till we have invoke */
1929 else
1930 {
1931 hv_store (hv, "desc", sizeof ("desc") - 1,
1932 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1933
1934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1935
1936 {
1937 dSP;
1938 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1939 PUTBACK;
1940 }
1941
1942 SvREFCNT_dec (GvAV (PL_defgv));
1943 GvAV (PL_defgv) = coro->invoke_av;
1944 coro->invoke_av = 0;
1945
1946 return 0;
1947 }
1948}
1949
1950static void
1951slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1952{
1953 HV *hv = (HV *)SvRV (coro_current);
1954 struct coro *coro = SvSTATE_hv ((SV *)hv);
1955
1956 if (expect_true (coro->saved_deffh))
1957 {
1958 /* subsequent iteration */
1959 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1960 coro->saved_deffh = 0;
1961
1962 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1963 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1964 {
1965 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1966 coro->invoke_av = newAV ();
1967
1968 frame->prepare = prepare_nop;
1969 }
1970 else
1971 {
1972 av_clear (GvAV (PL_defgv));
1973 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1974
1975 coro->prio = 0;
1976
1977 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1978 api_trace (aTHX_ coro_current, 0);
1979
1980 frame->prepare = prepare_schedule;
1981 av_push (av_async_pool, SvREFCNT_inc (hv));
1982 }
1983 }
1984 else
1985 {
1986 /* first iteration, simply fall through */
1987 frame->prepare = prepare_nop;
1988 }
1989
1990 frame->check = slf_check_pool_handler;
1991 frame->data = (void *)coro;
1992}
1993
1994/*****************************************************************************/
1995/* rouse callback */
1996
1997#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1998
1999static void
2000coro_rouse_callback (pTHX_ CV *cv)
2001{
2002 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG;
2004
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 {
2007 /* first call, set args */
2008 SV *coro = SvRV (data);
2009 AV *av = newAV ();
2010
2011 SvRV_set (data, (SV *)av);
2012
2013 /* better take a full copy of the arguments */
2014 while (items--)
2015 av_store (av, items, newSVsv (ST (items)));
2016
2017 api_ready (aTHX_ coro);
2018 SvREFCNT_dec (coro);
2019 }
2020
2021 XSRETURN_EMPTY;
2022}
2023
2024static int
2025slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2026{
2027 SV *data = (SV *)frame->data;
2028
2029 if (CORO_THROW)
2030 return 0;
2031
2032 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2033 return 1;
2034
2035 /* now push all results on the stack */
2036 {
2037 dSP;
2038 AV *av = (AV *)SvRV (data);
2039 int i;
2040
2041 EXTEND (SP, AvFILLp (av) + 1);
2042 for (i = 0; i <= AvFILLp (av); ++i)
2043 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2044
2045 /* we have stolen the elements, so set length to zero and free */
2046 AvFILLp (av) = -1;
2047 av_undef (av);
2048
2049 PUTBACK;
2050 }
2051
2052 return 0;
2053}
2054
2055static void
2056slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2057{
2058 SV *cb;
2059
2060 if (items)
2061 cb = arg [0];
2062 else
2063 {
2064 struct coro *coro = SvSTATE_current;
2065
2066 if (!coro->rouse_cb)
2067 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2068
2069 cb = sv_2mortal (coro->rouse_cb);
2070 coro->rouse_cb = 0;
2071 }
2072
2073 if (!SvROK (cb)
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,");
2077
2078 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG;
2081
2082 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait;
2085 }
2086}
2087
2088static SV *
2089coro_new_rouse_cb (pTHX)
2090{
2091 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2095
2096 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */
2098
2099 SvREFCNT_dec (coro->rouse_cb);
2100 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2101
2102 return cb;
1689} 2103}
1690 2104
1691/*****************************************************************************/ 2105/*****************************************************************************/
1692/* schedule-like-function opcode (SLF) */ 2106/* schedule-like-function opcode (SLF) */
1693 2107
… …
1717 2131
1718 RETURNOP (slf_restore.op_first); 2132 RETURNOP (slf_restore.op_first);
1719} 2133}
1720 2134
1721static void 2135static void
1722slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1723{
1724 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1725}
1726
1727static void
1728slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1729{
1730 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1731
1732 frame->prepare = slf_prepare_set_stacklevel;
1733 frame->check = slf_check_nop;
1734 frame->data = (void *)SvIV (arg [0]);
1735}
1736
1737static void
1738slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta) 2136slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1739{ 2137{
1740 SV **arg = (SV **)slf_frame.data; 2138 SV **arg = (SV **)slf_frame.data;
1741 2139
1742 prepare_transfer (aTHX_ ta, arg [0], arg [1]); 2140 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
… …
1759 frame->prepare = prepare_schedule; 2157 frame->prepare = prepare_schedule;
1760 frame->check = slf_check_nop; 2158 frame->check = slf_check_nop;
1761} 2159}
1762 2160
1763static void 2161static void
2162slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2163{
2164 struct coro *next = (struct coro *)slf_frame.data;
2165
2166 SvREFCNT_inc_NN (next->hv);
2167 prepare_schedule_to (aTHX_ ta, next);
2168}
2169
2170static void
2171slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2172{
2173 if (!items)
2174 croak ("Coro::schedule_to expects a coroutine argument, caught");
2175
2176 frame->data = (void *)SvSTATE (arg [0]);
2177 frame->prepare = slf_prepare_schedule_to;
2178 frame->check = slf_check_nop;
2179}
2180
2181static void
2182slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2183{
2184 api_ready (aTHX_ SvRV (coro_current));
2185
2186 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
2187}
2188
2189static void
1764slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2190slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1765{ 2191{
1766 frame->prepare = prepare_cede; 2192 frame->prepare = prepare_cede;
1767 frame->check = slf_check_nop; 2193 frame->check = slf_check_nop;
1768} 2194}
… …
1771slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2197slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1772{ 2198{
1773 frame->prepare = prepare_cede_notself; 2199 frame->prepare = prepare_cede_notself;
1774 frame->check = slf_check_nop; 2200 frame->check = slf_check_nop;
1775} 2201}
1776
1777/* we hijack an hopefully unused CV flag for our purposes */
1778#define CVf_SLF 0x4000
1779 2202
1780/* 2203/*
1781 * these not obviously related functions are all rolled into one 2204 * these not obviously related functions are all rolled into one
1782 * function to increase chances that they all will call transfer with the same 2205 * function to increase chances that they all will call transfer with the same
1783 * stack offset 2206 * stack offset
… …
1839 } 2262 }
1840 while (slf_frame.check (aTHX_ &slf_frame)); 2263 while (slf_frame.check (aTHX_ &slf_frame));
1841 2264
1842 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2265 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1843 2266
1844 /* return value handling - mostly like entersub */
1845 {
1846 dSP;
1847 SV **bot = PL_stack_base + checkmark;
1848 int gimme = GIMME_V;
1849
1850 /* make sure we put something on the stack in scalar context */
1851 if (gimme == G_SCALAR)
1852 {
1853 if (sp == bot)
1854 XPUSHs (&PL_sv_undef);
1855
1856 SP = bot + 1;
1857 }
1858
1859 PUTBACK;
1860 }
1861
1862 /* exception handling */ 2267 /* exception handling */
1863 if (expect_false (coro_throw)) 2268 if (expect_false (CORO_THROW))
1864 { 2269 {
1865 SV *exception = sv_2mortal (coro_throw); 2270 SV *exception = sv_2mortal (CORO_THROW);
1866 2271
1867 coro_throw = 0; 2272 CORO_THROW = 0;
1868 sv_setsv (ERRSV, exception); 2273 sv_setsv (ERRSV, exception);
1869 croak (0); 2274 croak (0);
2275 }
2276
2277 /* return value handling - mostly like entersub */
2278 /* make sure we put something on the stack in scalar context */
2279 if (GIMME_V == G_SCALAR)
2280 {
2281 dSP;
2282 SV **bot = PL_stack_base + checkmark;
2283
2284 if (sp == bot) /* too few, push undef */
2285 bot [1] = &PL_sv_undef;
2286 else if (sp != bot + 1) /* too many, take last one */
2287 bot [1] = *sp;
2288
2289 SP = bot + 1;
2290
2291 PUTBACK;
1870 } 2292 }
1871 2293
1872 return NORMAL; 2294 return NORMAL;
1873} 2295}
1874 2296
… …
1915 } 2337 }
1916 else 2338 else
1917 slf_argc = 0; 2339 slf_argc = 0;
1918 2340
1919 PL_op->op_ppaddr = pp_slf; 2341 PL_op->op_ppaddr = pp_slf;
1920 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2342 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1921 2343
1922 PL_op = (OP *)&slf_restore; 2344 PL_op = (OP *)&slf_restore;
2345}
2346
2347/*****************************************************************************/
2348/* dynamic wind */
2349
2350static void
2351on_enterleave_call (pTHX_ SV *cb)
2352{
2353 dSP;
2354
2355 PUSHSTACK;
2356
2357 PUSHMARK (SP);
2358 PUTBACK;
2359 call_sv (cb, G_VOID | G_DISCARD);
2360 SPAGAIN;
2361
2362 POPSTACK;
2363}
2364
2365static SV *
2366coro_avp_pop_and_free (pTHX_ AV **avp)
2367{
2368 AV *av = *avp;
2369 SV *res = av_pop (av);
2370
2371 if (AvFILLp (av) < 0)
2372 {
2373 *avp = 0;
2374 SvREFCNT_dec (av);
2375 }
2376
2377 return res;
2378}
2379
2380static void
2381coro_pop_on_enter (pTHX_ void *coro)
2382{
2383 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2384 SvREFCNT_dec (cb);
2385}
2386
2387static void
2388coro_pop_on_leave (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2391 on_enterleave_call (aTHX_ sv_2mortal (cb));
1923} 2392}
1924 2393
1925/*****************************************************************************/ 2394/*****************************************************************************/
1926/* PerlIO::cede */ 2395/* PerlIO::cede */
1927 2396
… …
1996 PerlIOBuf_get_cnt, 2465 PerlIOBuf_get_cnt,
1997 PerlIOBuf_set_ptrcnt, 2466 PerlIOBuf_set_ptrcnt,
1998}; 2467};
1999 2468
2000/*****************************************************************************/ 2469/*****************************************************************************/
2470/* Coro::Semaphore & Coro::Signal */
2471
2472static SV *
2473coro_waitarray_new (pTHX_ int count)
2474{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV ();
2477 SV **ary;
2478
2479 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *);
2481 AvALLOC (av) = ary;
2482#if PERL_VERSION_ATLEAST (5,10,0)
2483 AvARRAY (av) = ary;
2484#else
2485 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2486 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2487 SvPVX ((SV *)av) = (char *)ary;
2488#endif
2489 AvMAX (av) = 1;
2490 AvFILLp (av) = 0;
2491 ary [0] = newSViv (count);
2492
2493 return newRV_noinc ((SV *)av);
2494}
2495
2001/* Coro::Semaphore */ 2496/* semaphore */
2002 2497
2003static void 2498static void
2004coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2499coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2005{ 2500{
2006 SV *count_sv = AvARRAY (av)[0]; 2501 SV *count_sv = AvARRAY (av)[0];
… …
2018 AvARRAY (av)[0] = AvARRAY (av)[1]; 2513 AvARRAY (av)[0] = AvARRAY (av)[1];
2019 AvARRAY (av)[1] = count_sv; 2514 AvARRAY (av)[1] = count_sv;
2020 cb = av_shift (av); 2515 cb = av_shift (av);
2021 2516
2022 if (SvOBJECT (cb)) 2517 if (SvOBJECT (cb))
2518 {
2023 api_ready (aTHX_ cb); 2519 api_ready (aTHX_ cb);
2024 else 2520 --count;
2025 croak ("callbacks not yet supported"); 2521 }
2522 else if (SvTYPE (cb) == SVt_PVCV)
2523 {
2524 dSP;
2525 PUSHMARK (SP);
2526 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2527 PUTBACK;
2528 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2529 }
2026 2530
2027 SvREFCNT_dec (cb); 2531 SvREFCNT_dec (cb);
2028
2029 --count;
2030 } 2532 }
2031} 2533}
2032 2534
2033static void 2535static void
2034coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2536coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2036 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2538 /* call $sem->adjust (0) to possibly wake up some other waiters */
2037 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2539 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2038} 2540}
2039 2541
2040static int 2542static int
2041slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2543slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2042{ 2544{
2043 AV *av = (AV *)frame->data; 2545 AV *av = (AV *)frame->data;
2044 SV *count_sv = AvARRAY (av)[0]; 2546 SV *count_sv = AvARRAY (av)[0];
2045 2547
2548 /* if we are about to throw, don't actually acquire the lock, just throw */
2549 if (CORO_THROW)
2550 return 0;
2046 if (SvIVX (count_sv) > 0) 2551 else if (SvIVX (count_sv) > 0)
2047 { 2552 {
2048 SvSTATE_current->on_destroy = 0; 2553 SvSTATE_current->on_destroy = 0;
2554
2555 if (acquire)
2049 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2556 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2557 else
2558 coro_semaphore_adjust (aTHX_ av, 0);
2559
2050 return 0; 2560 return 0;
2051 } 2561 }
2052 else 2562 else
2053 { 2563 {
2054 int i; 2564 int i;
… …
2063 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2573 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2064 return 1; 2574 return 1;
2065 } 2575 }
2066} 2576}
2067 2577
2068static void 2578static int
2579slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2580{
2581 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2582}
2583
2584static int
2585slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2586{
2587 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2588}
2589
2590static void
2069slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2591slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2070{ 2592{
2071 AV *av = (AV *)SvRV (arg [0]); 2593 AV *av = (AV *)SvRV (arg [0]);
2072 2594
2073 if (SvIVX (AvARRAY (av)[0]) > 0) 2595 if (SvIVX (AvARRAY (av)[0]) > 0)
2074 { 2596 {
2075 frame->data = (void *)av; 2597 frame->data = (void *)av;
2076 frame->prepare = prepare_nop; 2598 frame->prepare = prepare_nop;
2077 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2078 } 2599 }
2079 else 2600 else
2080 { 2601 {
2081 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2602 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2082 2603
2083 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2604 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2084 frame->prepare = prepare_schedule; 2605 frame->prepare = prepare_schedule;
2085 2606
2086 /* to avoid race conditions when a woken-up coro gets terminated */ 2607 /* to avoid race conditions when a woken-up coro gets terminated */
2087 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2608 /* we arrange for a temporary on_destroy that calls adjust (0) */
2088 assert (!SvSTATE_current->on_destroy);//D
2089 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2609 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2090 } 2610 }
2611}
2091 2612
2613static void
2614slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2615{
2616 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2092 frame->check = slf_check_semaphore_down; 2617 frame->check = slf_check_semaphore_down;
2093
2094} 2618}
2095 2619
2096/*****************************************************************************/ 2620static void
2097/* gensub: simple closure generation utility */ 2621slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2098
2099#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2100
2101/* create a closure from XS, returns a code reference */
2102/* the arg can be accessed via GENSUB_ARG from the callback */
2103/* the callback must use dXSARGS/XSRETURN */
2104static SV *
2105gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2106{ 2622{
2107 CV *cv = (CV *)newSV (0); 2623 if (items >= 2)
2624 {
2625 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2108 2628
2109 sv_upgrade ((SV *)cv, SVt_PVCV); 2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv));
2110 2630
2111 CvANON_on (cv); 2631 if (SvIVX (AvARRAY (av)[0]) > 0)
2112 CvISXSUB_on (cv); 2632 coro_semaphore_adjust (aTHX_ av, 0);
2113 CvXSUB (cv) = xsub;
2114 GENSUB_ARG = arg;
2115 2633
2116 return newRV_noinc ((SV *)cv); 2634 frame->prepare = prepare_nop;
2635 frame->check = slf_check_nop;
2636 }
2637 else
2638 {
2639 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2640 frame->check = slf_check_semaphore_wait;
2641 }
2642}
2643
2644/* signal */
2645
2646static void
2647coro_signal_wake (pTHX_ AV *av, int count)
2648{
2649 SvIVX (AvARRAY (av)[0]) = 0;
2650
2651 /* now signal count waiters */
2652 while (count > 0 && AvFILLp (av) > 0)
2653 {
2654 SV *cb;
2655
2656 /* swap first two elements so we can shift a waiter */
2657 cb = AvARRAY (av)[0];
2658 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb;
2660
2661 cb = av_shift (av);
2662
2663 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */
2665 SvREFCNT_dec (cb);
2666
2667 --count;
2668 }
2669}
2670
2671static int
2672slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2673{
2674 /* if we are about to throw, also stop waiting */
2675 return SvROK ((SV *)frame->data) && !CORO_THROW;
2676}
2677
2678static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{
2681 AV *av = (AV *)SvRV (arg [0]);
2682
2683 if (SvIVX (AvARRAY (av)[0]))
2684 {
2685 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop;
2688 }
2689 else
2690 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */
2692
2693 av_push (av, waiter);
2694
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule;
2697 frame->check = slf_check_signal_wait;
2698 }
2117} 2699}
2118 2700
2119/*****************************************************************************/ 2701/*****************************************************************************/
2120/* Coro::AIO */ 2702/* Coro::AIO */
2121 2703
… …
2136 dXSARGS; 2718 dXSARGS;
2137 AV *state = (AV *)GENSUB_ARG; 2719 AV *state = (AV *)GENSUB_ARG;
2138 SV *coro = av_pop (state); 2720 SV *coro = av_pop (state);
2139 SV *data_sv = newSV (sizeof (struct io_state)); 2721 SV *data_sv = newSV (sizeof (struct io_state));
2140 2722
2141 av_extend (state, items); 2723 av_extend (state, items - 1);
2142 2724
2143 sv_upgrade (data_sv, SVt_PV); 2725 sv_upgrade (data_sv, SVt_PV);
2144 SvCUR_set (data_sv, sizeof (struct io_state)); 2726 SvCUR_set (data_sv, sizeof (struct io_state));
2145 SvPOK_only (data_sv); 2727 SvPOK_only (data_sv);
2146 2728
… …
2171static int 2753static int
2172slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2754slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2173{ 2755{
2174 AV *state = (AV *)frame->data; 2756 AV *state = (AV *)frame->data;
2175 2757
2758 /* if we are about to throw, return early */
2759 /* this does not cancel the aio request, but at least */
2760 /* it quickly returns */
2761 if (CORO_THROW)
2762 return 0;
2763
2176 /* one element that is an RV? repeat! */ 2764 /* one element that is an RV? repeat! */
2177 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2765 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2178 return 1; 2766 return 1;
2179 2767
2180 /* restore status */ 2768 /* restore status */
… …
2275 XSRETURN_EMPTY; 2863 XSRETURN_EMPTY;
2276} 2864}
2277 2865
2278/*****************************************************************************/ 2866/*****************************************************************************/
2279 2867
2868#if CORO_CLONE
2869# include "clone.c"
2870#endif
2871
2280MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2281 2873
2282PROTOTYPES: DISABLE 2874PROTOTYPES: DISABLE
2283 2875
2284BOOT: 2876BOOT:
… …
2288 coro_thx = PERL_GET_CONTEXT; 2880 coro_thx = PERL_GET_CONTEXT;
2289# endif 2881# endif
2290#endif 2882#endif
2291 BOOT_PAGESIZE; 2883 BOOT_PAGESIZE;
2292 2884
2885 cctx_current = cctx_new_empty ();
2886
2293 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2887 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2294 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2888 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2295 2889
2296 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2890 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2297 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2891 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2316 2910
2317 { 2911 {
2318 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2912 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2319 2913
2320 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2914 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2321 hv_store_ent (PL_custom_op_names, slf, 2915 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2322 newSVpv ("coro_slf", 0), 0);
2323 2916
2324 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2917 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2325 hv_store_ent (PL_custom_op_descs, slf, 2918 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2326 newSVpv ("coro schedule like function", 0), 0);
2327 } 2919 }
2328 2920
2329 coroapi.ver = CORO_API_VERSION; 2921 coroapi.ver = CORO_API_VERSION;
2330 coroapi.rev = CORO_API_REVISION; 2922 coroapi.rev = CORO_API_REVISION;
2331 2923
… …
2350 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
2351} 2943}
2352 2944
2353SV * 2945SV *
2354new (char *klass, ...) 2946new (char *klass, ...)
2947 ALIAS:
2948 Coro::new = 1
2355 CODE: 2949 CODE:
2356{ 2950{
2357 struct coro *coro; 2951 struct coro *coro;
2358 MAGIC *mg; 2952 MAGIC *mg;
2359 HV *hv; 2953 HV *hv;
2954 CV *cb;
2360 int i; 2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2361 2970
2362 Newz (0, coro, 1, struct coro); 2971 Newz (0, coro, 1, struct coro);
2363 coro->args = newAV (); 2972 coro->args = newAV ();
2364 coro->flags = CF_NEW; 2973 coro->flags = CF_NEW;
2365 2974
… …
2370 coro->hv = hv = newHV (); 2979 coro->hv = hv = newHV ();
2371 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2372 mg->mg_flags |= MGf_DUP; 2981 mg->mg_flags |= MGf_DUP;
2373 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2374 2983
2984 if (items > 1)
2985 {
2375 av_extend (coro->args, items - 1); 2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2376 for (i = 1; i < items; i++) 2996 for (i = 2; i < items; i++)
2377 av_push (coro->args, newSVsv (ST (i))); 2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2378} 2999}
2379 OUTPUT: 3000 OUTPUT:
2380 RETVAL 3001 RETVAL
2381
2382void
2383_set_stacklevel (...)
2384 CODE:
2385 CORO_EXECUTE_SLF_XS (slf_init_set_stacklevel);
2386 3002
2387void 3003void
2388transfer (...) 3004transfer (...)
2389 PROTOTYPE: $$ 3005 PROTOTYPE: $$
2390 CODE: 3006 CODE:
… …
2400void 3016void
2401_exit (int code) 3017_exit (int code)
2402 PROTOTYPE: $ 3018 PROTOTYPE: $
2403 CODE: 3019 CODE:
2404 _exit (code); 3020 _exit (code);
3021
3022SV *
3023clone (Coro::State coro)
3024 CODE:
3025{
3026#if CORO_CLONE
3027 struct coro *ncoro = coro_clone (aTHX_ coro);
3028 MAGIC *mg;
3029 /* TODO: too much duplication */
3030 ncoro->hv = newHV ();
3031 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3034#else
3035 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3036#endif
3037}
3038 OUTPUT:
3039 RETVAL
2405 3040
2406int 3041int
2407cctx_stacksize (int new_stacksize = 0) 3042cctx_stacksize (int new_stacksize = 0)
2408 PROTOTYPE: ;$ 3043 PROTOTYPE: ;$
2409 CODE: 3044 CODE:
… …
2459 eval = 1 3094 eval = 1
2460 CODE: 3095 CODE:
2461{ 3096{
2462 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3097 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2463 { 3098 {
2464 struct coro temp; 3099 struct coro *current = SvSTATE_current;
2465 3100
2466 if (!(coro->flags & CF_RUNNING)) 3101 if (current != coro)
2467 { 3102 {
2468 PUTBACK; 3103 PUTBACK;
2469 save_perl (aTHX_ &temp); 3104 save_perl (aTHX_ current);
2470 load_perl (aTHX_ coro); 3105 load_perl (aTHX_ coro);
3106 SPAGAIN;
2471 } 3107 }
2472 3108
2473 {
2474 dSP;
2475 ENTER;
2476 SAVETMPS;
2477 PUTBACK;
2478 PUSHSTACK; 3109 PUSHSTACK;
3110
2479 PUSHMARK (SP); 3111 PUSHMARK (SP);
3112 PUTBACK;
2480 3113
2481 if (ix) 3114 if (ix)
2482 eval_sv (coderef, 0); 3115 eval_sv (coderef, 0);
2483 else 3116 else
2484 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3117 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2485 3118
2486 POPSTACK; 3119 POPSTACK;
2487 SPAGAIN; 3120 SPAGAIN;
2488 FREETMPS;
2489 LEAVE;
2490 PUTBACK;
2491 }
2492 3121
2493 if (!(coro->flags & CF_RUNNING)) 3122 if (current != coro)
2494 { 3123 {
3124 PUTBACK;
2495 save_perl (aTHX_ coro); 3125 save_perl (aTHX_ coro);
2496 load_perl (aTHX_ &temp); 3126 load_perl (aTHX_ current);
2497 SPAGAIN; 3127 SPAGAIN;
2498 } 3128 }
2499 } 3129 }
2500} 3130}
2501 3131
… …
2505 ALIAS: 3135 ALIAS:
2506 is_ready = CF_READY 3136 is_ready = CF_READY
2507 is_running = CF_RUNNING 3137 is_running = CF_RUNNING
2508 is_new = CF_NEW 3138 is_new = CF_NEW
2509 is_destroyed = CF_DESTROYED 3139 is_destroyed = CF_DESTROYED
3140 is_suspended = CF_SUSPENDED
2510 CODE: 3141 CODE:
2511 RETVAL = boolSV (coro->flags & ix); 3142 RETVAL = boolSV (coro->flags & ix);
2512 OUTPUT: 3143 OUTPUT:
2513 RETVAL 3144 RETVAL
2514 3145
… …
2516throw (Coro::State self, SV *throw = &PL_sv_undef) 3147throw (Coro::State self, SV *throw = &PL_sv_undef)
2517 PROTOTYPE: $;$ 3148 PROTOTYPE: $;$
2518 CODE: 3149 CODE:
2519{ 3150{
2520 struct coro *current = SvSTATE_current; 3151 struct coro *current = SvSTATE_current;
2521 SV **throwp = self == current ? &coro_throw : &self->throw; 3152 SV **throwp = self == current ? &CORO_THROW : &self->except;
2522 SvREFCNT_dec (*throwp); 3153 SvREFCNT_dec (*throwp);
2523 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2524} 3155}
2525 3156
2526void 3157void
… …
2530 3161
2531SV * 3162SV *
2532has_cctx (Coro::State coro) 3163has_cctx (Coro::State coro)
2533 PROTOTYPE: $ 3164 PROTOTYPE: $
2534 CODE: 3165 CODE:
2535 RETVAL = boolSV (!!coro->cctx); 3166 /* maybe manage the running flag differently */
3167 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2536 OUTPUT: 3168 OUTPUT:
2537 RETVAL 3169 RETVAL
2538 3170
2539int 3171int
2540is_traced (Coro::State coro) 3172is_traced (Coro::State coro)
… …
2560 3192
2561void 3193void
2562force_cctx () 3194force_cctx ()
2563 PROTOTYPE: 3195 PROTOTYPE:
2564 CODE: 3196 CODE:
2565 SvSTATE_current->cctx->idle_sp = 0; 3197 cctx_current->idle_sp = 0;
2566 3198
2567void 3199void
2568swap_defsv (Coro::State self) 3200swap_defsv (Coro::State self)
2569 PROTOTYPE: $ 3201 PROTOTYPE: $
2570 ALIAS: 3202 ALIAS:
… …
2578 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3210 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2579 3211
2580 SV *tmp = *src; *src = *dst; *dst = tmp; 3212 SV *tmp = *src; *src = *dst; *dst = tmp;
2581 } 3213 }
2582 3214
3215void
3216cancel (Coro::State self)
3217 CODE:
3218 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3220
2583 3221
2584MODULE = Coro::State PACKAGE = Coro 3222MODULE = Coro::State PACKAGE = Coro
2585 3223
2586BOOT: 3224BOOT:
2587{ 3225{
2588 int i;
2589
2590 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2591 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3226 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2592 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3227 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2593 3228 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3229 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2594 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3230 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2595 SvREADONLY_on (coro_current); 3231 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3232 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3233 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3234 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3235
3236 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3237 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3238 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3239 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2596 3240
2597 coro_stash = gv_stashpv ("Coro", TRUE); 3241 coro_stash = gv_stashpv ("Coro", TRUE);
2598 3242
2599 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3243 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
2600 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3244 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
2601 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3245 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
2602 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3246 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
2603 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3247 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
2604 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3248 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
2605 3249
2606 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2607 coro_ready[i] = newAV ();
2608
2609 { 3250 {
2610 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3251 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2611 3252
2612 coroapi.schedule = api_schedule; 3253 coroapi.schedule = api_schedule;
3254 coroapi.schedule_to = api_schedule_to;
2613 coroapi.cede = api_cede; 3255 coroapi.cede = api_cede;
2614 coroapi.cede_notself = api_cede_notself; 3256 coroapi.cede_notself = api_cede_notself;
2615 coroapi.ready = api_ready; 3257 coroapi.ready = api_ready;
2616 coroapi.is_ready = api_is_ready; 3258 coroapi.is_ready = api_is_ready;
2617 coroapi.nready = coro_nready; 3259 coroapi.nready = coro_nready;
2618 coroapi.current = coro_current; 3260 coroapi.current = coro_current;
2619 3261
2620 GCoroAPI = &coroapi; 3262 /*GCoroAPI = &coroapi;*/
2621 sv_setiv (sv, (IV)&coroapi); 3263 sv_setiv (sv, (IV)&coroapi);
2622 SvREADONLY_on (sv); 3264 SvREADONLY_on (sv);
2623 } 3265 }
2624} 3266}
3267
3268void
3269terminate (...)
3270 CODE:
3271 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2625 3272
2626void 3273void
2627schedule (...) 3274schedule (...)
2628 CODE: 3275 CODE:
2629 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3276 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3277
3278void
3279schedule_to (...)
3280 CODE:
3281 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3282
3283void
3284cede_to (...)
3285 CODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2630 3287
2631void 3288void
2632cede (...) 3289cede (...)
2633 CODE: 3290 CODE:
2634 CORO_EXECUTE_SLF_XS (slf_init_cede); 3291 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2689 CODE: 3346 CODE:
2690 RETVAL = coro_nready; 3347 RETVAL = coro_nready;
2691 OUTPUT: 3348 OUTPUT:
2692 RETVAL 3349 RETVAL
2693 3350
2694# for async_pool speedup
2695void 3351void
2696_pool_1 (SV *cb) 3352suspend (Coro::State self)
3353 PROTOTYPE: $
2697 CODE: 3354 CODE:
2698{ 3355 self->flags |= CF_SUSPENDED;
2699 HV *hv = (HV *)SvRV (coro_current);
2700 struct coro *coro = SvSTATE_hv ((SV *)hv);
2701 AV *defav = GvAV (PL_defgv);
2702 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2703 AV *invoke_av;
2704 int i, len;
2705 3356
2706 if (!invoke) 3357void
3358resume (Coro::State self)
3359 PROTOTYPE: $
3360 CODE:
3361 self->flags &= ~CF_SUSPENDED;
3362
3363void
3364_pool_handler (...)
3365 CODE:
3366 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3367
3368void
3369async_pool (SV *cv, ...)
3370 PROTOTYPE: &@
3371 PPCODE:
3372{
3373 HV *hv = (HV *)av_pop (av_async_pool);
3374 AV *av = newAV ();
3375 SV *cb = ST (0);
3376 int i;
3377
3378 av_extend (av, items - 2);
3379 for (i = 1; i < items; ++i)
3380 av_push (av, SvREFCNT_inc_NN (ST (i)));
3381
3382 if ((SV *)hv == &PL_sv_undef)
2707 { 3383 {
2708 SV *old = PL_diehook; 3384 PUSHMARK (SP);
2709 PL_diehook = 0; 3385 EXTEND (SP, 2);
2710 SvREFCNT_dec (old); 3386 PUSHs (sv_Coro);
2711 croak ("\3async_pool terminate\2\n"); 3387 PUSHs ((SV *)cv_pool_handler);
3388 PUTBACK;
3389 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3390 SPAGAIN;
3391
3392 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2712 } 3393 }
2713 3394
2714 SvREFCNT_dec (coro->saved_deffh);
2715 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2716
2717 hv_store (hv, "desc", sizeof ("desc") - 1,
2718 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2719
2720 invoke_av = (AV *)SvRV (invoke);
2721 len = av_len (invoke_av);
2722
2723 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2724
2725 if (len > 0)
2726 { 3395 {
2727 av_fill (defav, len - 1); 3396 struct coro *coro = SvSTATE_hv (hv);
2728 for (i = 0; i < len; ++i) 3397
2729 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3398 assert (!coro->invoke_cb);
3399 assert (!coro->invoke_av);
3400 coro->invoke_cb = SvREFCNT_inc (cb);
3401 coro->invoke_av = av;
2730 } 3402 }
3403
3404 api_ready (aTHX_ (SV *)hv);
3405
3406 if (GIMME_V != G_VOID)
3407 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3408 else
3409 SvREFCNT_dec (hv);
2731} 3410}
3411
3412SV *
3413rouse_cb ()
3414 PROTOTYPE:
3415 CODE:
3416 RETVAL = coro_new_rouse_cb (aTHX);
3417 OUTPUT:
3418 RETVAL
2732 3419
2733void 3420void
2734_pool_2 (SV *cb) 3421rouse_wait (...)
3422 PROTOTYPE: ;$
3423 PPCODE:
3424 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3425
3426void
3427on_enter (SV *block)
3428 ALIAS:
3429 on_leave = 1
3430 PROTOTYPE: &
2735 CODE: 3431 CODE:
2736{ 3432{
2737 HV *hv = (HV *)SvRV (coro_current);
2738 struct coro *coro = SvSTATE_hv ((SV *)hv); 3433 struct coro *coro = SvSTATE_current;
3434 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2739 3435
2740 sv_setsv (cb, &PL_sv_undef); 3436 block = (SV *)coro_sv_2cv (aTHX_ block);
2741 3437
2742 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3438 if (!*avp)
2743 coro->saved_deffh = 0; 3439 *avp = newAV ();
2744 3440
2745 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3441 av_push (*avp, SvREFCNT_inc (block));
2746 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2747 {
2748 SV *old = PL_diehook;
2749 PL_diehook = 0;
2750 SvREFCNT_dec (old);
2751 croak ("\3async_pool terminate\2\n");
2752 }
2753 3442
2754 av_clear (GvAV (PL_defgv)); 3443 if (!ix)
2755 hv_store (hv, "desc", sizeof ("desc") - 1, 3444 on_enterleave_call (aTHX_ block);
2756 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2757 3445
2758 coro->prio = 0; 3446 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2759 3447 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2760 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3448 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2761 api_trace (aTHX_ coro_current, 0);
2762
2763 av_push (av_async_pool, newSVsv (coro_current));
2764} 3449}
2765 3450
2766 3451
2767MODULE = Coro::State PACKAGE = PerlIO::cede 3452MODULE = Coro::State PACKAGE = PerlIO::cede
2768 3453
… …
2771 3456
2772 3457
2773MODULE = Coro::State PACKAGE = Coro::Semaphore 3458MODULE = Coro::State PACKAGE = Coro::Semaphore
2774 3459
2775SV * 3460SV *
2776new (SV *klass, SV *count_ = 0) 3461new (SV *klass, SV *count = 0)
2777 CODE: 3462 CODE:
2778{ 3463 RETVAL = sv_bless (
2779 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3464 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1),
2780 AV *av = newAV (); 3465 GvSTASH (CvGV (cv))
2781 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1)); 3466 );
2782 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3467 OUTPUT:
2783} 3468 RETVAL
3469
3470# helper for Coro::Channel and others
3471SV *
3472_alloc (int count)
3473 CODE:
3474 RETVAL = coro_waitarray_new (aTHX_ count);
2784 OUTPUT: 3475 OUTPUT:
2785 RETVAL 3476 RETVAL
2786 3477
2787SV * 3478SV *
2788count (SV *self) 3479count (SV *self)
… …
2797 adjust = 1 3488 adjust = 1
2798 CODE: 3489 CODE:
2799 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3490 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2800 3491
2801void 3492void
2802down (SV *self) 3493down (...)
2803 CODE: 3494 CODE:
2804 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3495 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3496
3497void
3498wait (...)
3499 CODE:
3500 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2805 3501
2806void 3502void
2807try (SV *self) 3503try (SV *self)
2808 PPCODE: 3504 PPCODE:
2809{ 3505{
… …
2821 XSRETURN_NO; 3517 XSRETURN_NO;
2822} 3518}
2823 3519
2824void 3520void
2825waiters (SV *self) 3521waiters (SV *self)
2826 CODE: 3522 PPCODE:
2827{ 3523{
2828 AV *av = (AV *)SvRV (self); 3524 AV *av = (AV *)SvRV (self);
3525 int wcount = AvFILLp (av) + 1 - 1;
2829 3526
2830 if (GIMME_V == G_SCALAR) 3527 if (GIMME_V == G_SCALAR)
2831 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3528 XPUSHs (sv_2mortal (newSViv (wcount)));
2832 else 3529 else
2833 { 3530 {
2834 int i; 3531 int i;
2835 EXTEND (SP, AvFILLp (av) + 1 - 1); 3532 EXTEND (SP, wcount);
2836 for (i = 1; i <= AvFILLp (av); ++i) 3533 for (i = 1; i <= wcount; ++i)
2837 PUSHs (newSVsv (AvARRAY (av)[i])); 3534 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2838 } 3535 }
2839} 3536}
3537
3538MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3539
3540void
3541_may_delete (SV *sem, int count, int extra_refs)
3542 PPCODE:
3543{
3544 AV *av = (AV *)SvRV (sem);
3545
3546 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3547 && AvFILLp (av) == 0 /* no waiters, just count */
3548 && SvIV (AvARRAY (av)[0]) == count)
3549 XSRETURN_YES;
3550
3551 XSRETURN_NO;
3552}
3553
3554MODULE = Coro::State PACKAGE = Coro::Signal
3555
3556SV *
3557new (SV *klass)
3558 CODE:
3559 RETVAL = sv_bless (
3560 coro_waitarray_new (aTHX_ 0),
3561 GvSTASH (CvGV (cv))
3562 );
3563 OUTPUT:
3564 RETVAL
3565
3566void
3567wait (...)
3568 CODE:
3569 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3570
3571void
3572broadcast (SV *self)
3573 CODE:
3574{
3575 AV *av = (AV *)SvRV (self);
3576 coro_signal_wake (aTHX_ av, AvFILLp (av));
3577}
3578
3579void
3580send (SV *self)
3581 CODE:
3582{
3583 AV *av = (AV *)SvRV (self);
3584
3585 if (AvFILLp (av))
3586 coro_signal_wake (aTHX_ av, 1);
3587 else
3588 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3589}
3590
3591IV
3592awaited (SV *self)
3593 CODE:
3594 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3595 OUTPUT:
3596 RETVAL
2840 3597
2841 3598
2842MODULE = Coro::State PACKAGE = Coro::AnyEvent 3599MODULE = Coro::State PACKAGE = Coro::AnyEvent
2843 3600
2844BOOT: 3601BOOT:
… …
2859 sv_setsv (sv_activity, &PL_sv_undef); 3616 sv_setsv (sv_activity, &PL_sv_undef);
2860 if (coro_nready >= incede) 3617 if (coro_nready >= incede)
2861 { 3618 {
2862 PUSHMARK (SP); 3619 PUSHMARK (SP);
2863 PUTBACK; 3620 PUTBACK;
2864 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL); 3621 call_pv ("Coro::AnyEvent::_activity", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2865 SPAGAIN;
2866 } 3622 }
2867 3623
2868 --incede; 3624 --incede;
2869} 3625}
2870 3626
… …
2873 3629
2874void 3630void
2875_register (char *target, char *proto, SV *req) 3631_register (char *target, char *proto, SV *req)
2876 CODE: 3632 CODE:
2877{ 3633{
2878 HV *st; 3634 CV *req_cv = coro_sv_2cv (aTHX_ req);
2879 GV *gvp;
2880 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2881 /* newXSproto doesn't return the CV on 5.8 */ 3635 /* newXSproto doesn't return the CV on 5.8 */
2882 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3636 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2883 sv_setpv ((SV *)slf_cv, proto); 3637 sv_setpv ((SV *)slf_cv, proto);
2884 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3638 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2885} 3639}

Diff Legend

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