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.292 by root, Tue Nov 18 06:09:35 2008 UTC vs.
Revision 1.359 by root, Mon Jun 29 05:07:19 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
136#else 144#else
137# define attribute(x) 145# define attribute(x)
138# define expect(expr,value) (expr) 146# define expect(expr,value) (expr)
139# define INLINE static 147# define INLINE static
… …
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;
161# endif
162#endif
163
164#ifdef __linux
165# include <time.h> /* for timespec */
166# include <syscall.h> /* for SYS_* */
167# ifdef SYS_clock_gettime
168# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
169# define CORO_CLOCK_MONOTONIC 1
170# define CORO_CLOCK_THREAD_CPUTIME_ID 3
152# endif 171# endif
153#endif 172#endif
154 173
155static double (*nvtime)(); /* so why doesn't it take void? */ 174static double (*nvtime)(); /* so why doesn't it take void? */
156 175
… …
164static AV *main_mainstack; /* used to differentiate between $main and others */ 183static AV *main_mainstack; /* used to differentiate between $main and others */
165static JMPENV *main_top_env; 184static JMPENV *main_top_env;
166static HV *coro_state_stash, *coro_stash; 185static HV *coro_state_stash, *coro_stash;
167static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 186static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
168 187
188static AV *av_destroy; /* destruction queue */
189static SV *sv_manager; /* the manager coro */
190static SV *sv_idle; /* $Coro::idle */
191
169static GV *irsgv; /* $/ */ 192static GV *irsgv; /* $/ */
170static GV *stdoutgv; /* *STDOUT */ 193static GV *stdoutgv; /* *STDOUT */
171static SV *rv_diehook; 194static SV *rv_diehook;
172static SV *rv_warnhook; 195static SV *rv_warnhook;
173static HV *hv_sig; /* %SIG */ 196static HV *hv_sig; /* %SIG */
174 197
175/* async_pool helper stuff */ 198/* async_pool helper stuff */
176static SV *sv_pool_rss; 199static SV *sv_pool_rss;
177static SV *sv_pool_size; 200static SV *sv_pool_size;
201static SV *sv_async_pool_idle; /* description string */
178static AV *av_async_pool; 202static AV *av_async_pool; /* idle pool */
203static SV *sv_Coro; /* class string */
204static CV *cv_pool_handler;
205static CV *cv_coro_state_new;
179 206
180/* Coro::AnyEvent */ 207/* Coro::AnyEvent */
181static SV *sv_activity; 208static SV *sv_activity;
209
210/* enable processtime/realtime profiling */
211static char profile_times;
212typedef U32 coro_ts[2];
182 213
183static struct coro_cctx *cctx_first; 214static struct coro_cctx *cctx_first;
184static int cctx_count, cctx_idle; 215static int cctx_count, cctx_idle;
185 216
186enum { 217enum {
… …
212 int valgrind_id; 243 int valgrind_id;
213#endif 244#endif
214 unsigned char flags; 245 unsigned char flags;
215} coro_cctx; 246} coro_cctx;
216 247
248coro_cctx *cctx_current; /* the currently running cctx */
249
250/*****************************************************************************/
251
217enum { 252enum {
218 CF_RUNNING = 0x0001, /* coroutine is running */ 253 CF_RUNNING = 0x0001, /* coroutine is running */
219 CF_READY = 0x0002, /* coroutine is ready */ 254 CF_READY = 0x0002, /* coroutine is ready */
220 CF_NEW = 0x0004, /* has never been switched to */ 255 CF_NEW = 0x0004, /* has never been switched to */
221 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 256 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
257 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
222}; 258};
223 259
224/* the structure where most of the perl state is stored, overlaid on the cxstack */ 260/* the structure where most of the perl state is stored, overlaid on the cxstack */
225typedef struct 261typedef struct
226{ 262{
227 SV *defsv; 263 SV *defsv;
228 AV *defav; 264 AV *defav;
229 SV *errsv; 265 SV *errsv;
230 SV *irsgv; 266 SV *irsgv;
267 HV *hinthv;
231#define VAR(name,type) type name; 268#define VAR(name,type) type name;
232# include "state.h" 269# include "state.h"
233#undef VAR 270#undef VAR
234} perl_slots; 271} perl_slots;
235 272
… …
238/* this is a structure representing a perl-level coroutine */ 275/* this is a structure representing a perl-level coroutine */
239struct coro { 276struct coro {
240 /* the C coroutine allocated to this perl coroutine, if any */ 277 /* the C coroutine allocated to this perl coroutine, if any */
241 coro_cctx *cctx; 278 coro_cctx *cctx;
242 279
280 /* ready queue */
281 struct coro *next_ready;
282
243 /* state data */ 283 /* state data */
244 struct CoroSLF slf_frame; /* saved slf frame */ 284 struct CoroSLF slf_frame; /* saved slf frame */
245 AV *mainstack; 285 AV *mainstack;
246 perl_slots *slot; /* basically the saved sp */ 286 perl_slots *slot; /* basically the saved sp */
247 287
288 CV *startcv; /* the CV to execute */
248 AV *args; /* data associated with this coroutine (initial args) */ 289 AV *args; /* data associated with this coroutine (initial args) */
249 int refcnt; /* coroutines are refcounted, yes */ 290 int refcnt; /* coroutines are refcounted, yes */
250 int flags; /* CF_ flags */ 291 int flags; /* CF_ flags */
251 HV *hv; /* the perl hash associated with this coro, if any */ 292 HV *hv; /* the perl hash associated with this coro, if any */
252 void (*on_destroy)(pTHX_ struct coro *coro); 293 void (*on_destroy)(pTHX_ struct coro *coro);
253 294
254 /* statistics */ 295 /* statistics */
255 int usecount; /* number of transfers to this coro */ 296 int usecount; /* number of transfers to this coro */
256 297
257 /* coro process data */ 298 /* coro process data */
258 int prio; 299 int prio;
259 SV *throw; /* exception to be thrown */ 300 SV *except; /* exception to be thrown */
301 SV *rouse_cb;
260 302
261 /* async_pool */ 303 /* async_pool */
262 SV *saved_deffh; 304 SV *saved_deffh;
305 SV *invoke_cb;
306 AV *invoke_av;
307
308 /* on_enter/on_leave */
309 AV *on_enter;
310 AV *on_leave;
263 311
264 /* linked list */ 312 /* linked list */
265 struct coro *next, *prev; 313 struct coro *next, *prev;
266}; 314};
267 315
… …
270 318
271/* the following variables are effectively part of the perl context */ 319/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */ 320/* and get copied between struct coro and these variables */
273/* the mainr easonw e don't support windows process emulation */ 321/* the mainr easonw e don't support windows process emulation */
274static struct CoroSLF slf_frame; /* the current slf frame */ 322static struct CoroSLF slf_frame; /* the current slf frame */
275static SV *coro_throw;
276 323
277/** Coro ********************************************************************/ 324/** Coro ********************************************************************/
278 325
279#define PRIO_MAX 3 326#define CORO_PRIO_MAX 3
280#define PRIO_HIGH 1 327#define CORO_PRIO_HIGH 1
281#define PRIO_NORMAL 0 328#define CORO_PRIO_NORMAL 0
282#define PRIO_LOW -1 329#define CORO_PRIO_LOW -1
283#define PRIO_IDLE -3 330#define CORO_PRIO_IDLE -3
284#define PRIO_MIN -4 331#define CORO_PRIO_MIN -4
285 332
286/* for Coro.pm */ 333/* for Coro.pm */
287static SV *coro_current; 334static SV *coro_current;
288static SV *coro_readyhook; 335static SV *coro_readyhook;
289static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 336static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
337static CV *cv_coro_run, *cv_coro_terminate;
290static struct coro *coro_first; 338static struct coro *coro_first;
291#define coro_nready coroapi.nready 339#define coro_nready coroapi.nready
292 340
293/** lowlevel stuff **********************************************************/ 341/** lowlevel stuff **********************************************************/
294 342
… …
320 get_hv (name, create); 368 get_hv (name, create);
321#endif 369#endif
322 return get_hv (name, create); 370 return get_hv (name, create);
323} 371}
324 372
373/* may croak */
374INLINE CV *
375coro_sv_2cv (pTHX_ SV *sv)
376{
377 HV *st;
378 GV *gvp;
379 CV *cv = sv_2cv (sv, &st, &gvp, 0);
380
381 if (!cv)
382 croak ("code reference expected");
383
384 return cv;
385}
386
387/*****************************************************************************/
388/* magic glue */
389
390#define CORO_MAGIC_type_cv 26
391#define CORO_MAGIC_type_state PERL_MAGIC_ext
392
393#define CORO_MAGIC_NN(sv, type) \
394 (expect_true (SvMAGIC (sv)->mg_type == type) \
395 ? SvMAGIC (sv) \
396 : mg_find (sv, type))
397
398#define CORO_MAGIC(sv, type) \
399 (expect_true (SvMAGIC (sv)) \
400 ? CORO_MAGIC_NN (sv, type) \
401 : 0)
402
403#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
404#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
405
406INLINE struct coro *
407SvSTATE_ (pTHX_ SV *coro)
408{
409 HV *stash;
410 MAGIC *mg;
411
412 if (SvROK (coro))
413 coro = SvRV (coro);
414
415 if (expect_false (SvTYPE (coro) != SVt_PVHV))
416 croak ("Coro::State object required");
417
418 stash = SvSTASH (coro);
419 if (expect_false (stash != coro_stash && stash != coro_state_stash))
420 {
421 /* very slow, but rare, check */
422 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
423 croak ("Coro::State object required");
424 }
425
426 mg = CORO_MAGIC_state (coro);
427 return (struct coro *)mg->mg_ptr;
428}
429
430#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
431
432/* faster than SvSTATE, but expects a coroutine hv */
433#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
434#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
435
436/*****************************************************************************/
437/* padlist management and caching */
438
325static AV * 439static AV *
326coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
327{ 441{
328 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
329 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
330 444
331 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
336 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
337#endif 451#endif
338 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
339 --AvFILLp (padlist); 453 --AvFILLp (padlist);
340 454
341 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
342 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
343 457
344 return newpadlist; 458 return newpadlist;
345} 459}
346 460
347static void 461static void
348free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
349{ 463{
350 /* may be during global destruction */ 464 /* may be during global destruction */
351 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
352 { 466 {
353 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
354 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
355 { 470 {
356 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
357 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
358 { 473 I32 j = AvFILLp (av);
359 SV *sv; 474
360 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
361 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
362
363 SvREFCNT_dec (*svp);
364 }
365 } 480 }
366 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
367 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
368 } 486 }
369} 487}
370 488
371static int 489static int
372coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
373{ 491{
374 AV *padlist; 492 AV *padlist;
375 AV *av = (AV *)mg->mg_obj; 493 AV *av = (AV *)mg->mg_obj;
494
495 /* perl manages to free our internal AV and _then_ call us */
496 if (IN_DESTRUCT)
497 return;
376 498
377 /* casting is fun. */ 499 /* casting is fun. */
378 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
379 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
380 502
381 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
382 504
383 return 0; 505 return 0;
384} 506}
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 507
389static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
390 0, 0, 0, 0, 509 0, 0, 0, 0,
391 coro_cv_free 510 coro_cv_free
392}; 511};
393
394#define CORO_MAGIC_NN(sv, type) \
395 (expect_true (SvMAGIC (sv)->mg_type == type) \
396 ? SvMAGIC (sv) \
397 : mg_find (sv, type))
398
399#define CORO_MAGIC(sv, type) \
400 (expect_true (SvMAGIC (sv)) \
401 ? CORO_MAGIC_NN (sv, type) \
402 : 0)
403
404#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
405#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
406
407INLINE struct coro *
408SvSTATE_ (pTHX_ SV *coro)
409{
410 HV *stash;
411 MAGIC *mg;
412
413 if (SvROK (coro))
414 coro = SvRV (coro);
415
416 if (expect_false (SvTYPE (coro) != SVt_PVHV))
417 croak ("Coro::State object required");
418
419 stash = SvSTASH (coro);
420 if (expect_false (stash != coro_stash && stash != coro_state_stash))
421 {
422 /* very slow, but rare, check */
423 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
424 croak ("Coro::State object required");
425 }
426
427 mg = CORO_MAGIC_state (coro);
428 return (struct coro *)mg->mg_ptr;
429}
430
431#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
432
433/* faster than SvSTATE, but expects a coroutine hv */
434#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
435#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
436 512
437/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
438static void 514static void
439get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
440{ 516{
… …
446 else 522 else
447 { 523 {
448#if CORO_PREFER_PERL_FUNCTIONS 524#if CORO_PREFER_PERL_FUNCTIONS
449 /* this is probably cleaner? but also slower! */ 525 /* this is probably cleaner? but also slower! */
450 /* in practise, it seems to be less stable */ 526 /* in practise, it seems to be less stable */
451 CV *cp = Perl_cv_clone (cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
452 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
453 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
454 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
455#else 531#else
456 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
457#endif 533#endif
458 } 534 }
459} 535}
460 536
461static void 537static void
… …
468 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 544 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
469 545
470 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
471 547
472 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
473 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
474 550
475 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
476} 552}
477 553
478/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
479 558
480static void 559static void
481load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
482{ 561{
483 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
484 c->slot = 0; 563 c->slot = 0;
485 564
486 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
487 566
488 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
489 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
490 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
491 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
492 572
493 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
494 # include "state.h" 574 # include "state.h"
495 #undef VAR 575 #undef VAR
496 576
… …
509 589
510 PUTBACK; 590 PUTBACK;
511 } 591 }
512 592
513 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
514 coro_throw = c->throw; 594 CORO_THROW = c->except;
595
596 if (expect_false (c->on_enter))
597 {
598 int i;
599
600 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
602 }
515} 603}
516 604
517static void 605static void
518save_perl (pTHX_ Coro__State c) 606save_perl (pTHX_ Coro__State c)
519{ 607{
520 c->throw = coro_throw; 608 if (expect_false (c->on_leave))
609 {
610 int i;
611
612 for (i = AvFILLp (c->on_leave); i >= 0; --i)
613 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
614 }
615
616 c->except = CORO_THROW;
521 c->slf_frame = slf_frame; 617 c->slf_frame = slf_frame;
522 618
523 { 619 {
524 dSP; 620 dSP;
525 I32 cxix = cxstack_ix; 621 I32 cxix = cxstack_ix;
… …
537 { 633 {
538 while (expect_true (cxix >= 0)) 634 while (expect_true (cxix >= 0))
539 { 635 {
540 PERL_CONTEXT *cx = &ccstk[cxix--]; 636 PERL_CONTEXT *cx = &ccstk[cxix--];
541 637
542 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 638 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
543 { 639 {
544 CV *cv = cx->blk_sub.cv; 640 CV *cv = cx->blk_sub.cv;
545 641
546 if (expect_true (CvDEPTH (cv))) 642 if (expect_true (CvDEPTH (cv)))
547 { 643 {
… …
582 c->mainstack = PL_mainstack; 678 c->mainstack = PL_mainstack;
583 679
584 { 680 {
585 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 681 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
586 682
587 slot->defav = GvAV (PL_defgv); 683 slot->defav = GvAV (PL_defgv);
588 slot->defsv = DEFSV; 684 slot->defsv = DEFSV;
589 slot->errsv = ERRSV; 685 slot->errsv = ERRSV;
590 slot->irsgv = GvSV (irsgv); 686 slot->irsgv = GvSV (irsgv);
687 slot->hinthv = GvHV (PL_hintgv);
591 688
592 #define VAR(name,type) slot->name = PL_ ## name; 689 #define VAR(name,type) slot->name = PL_ ## name;
593 # include "state.h" 690 # include "state.h"
594 #undef VAR 691 #undef VAR
595 } 692 }
… …
600 * of perl.c:init_stacks, except that it uses less memory 697 * of perl.c:init_stacks, except that it uses less memory
601 * on the (sometimes correct) assumption that coroutines do 698 * on the (sometimes correct) assumption that coroutines do
602 * not usually need a lot of stackspace. 699 * not usually need a lot of stackspace.
603 */ 700 */
604#if CORO_PREFER_PERL_FUNCTIONS 701#if CORO_PREFER_PERL_FUNCTIONS
605# define coro_init_stacks init_stacks 702# define coro_init_stacks(thx) init_stacks ()
606#else 703#else
607static void 704static void
608coro_init_stacks (pTHX) 705coro_init_stacks (pTHX)
609{ 706{
610 PL_curstackinfo = new_stackinfo(32, 8); 707 PL_curstackinfo = new_stackinfo(32, 8);
… …
673#if !PERL_VERSION_ATLEAST (5,10,0) 770#if !PERL_VERSION_ATLEAST (5,10,0)
674 Safefree (PL_retstack); 771 Safefree (PL_retstack);
675#endif 772#endif
676} 773}
677 774
775#define CORO_RSS \
776 rss += sizeof (SYM (curstackinfo)); \
777 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
778 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
779 rss += SYM (tmps_max) * sizeof (SV *); \
780 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
781 rss += SYM (scopestack_max) * sizeof (I32); \
782 rss += SYM (savestack_max) * sizeof (ANY);
783
678static size_t 784static size_t
679coro_rss (pTHX_ struct coro *coro) 785coro_rss (pTHX_ struct coro *coro)
680{ 786{
681 size_t rss = sizeof (*coro); 787 size_t rss = sizeof (*coro);
682 788
683 if (coro->mainstack) 789 if (coro->mainstack)
684 { 790 {
685 perl_slots tmp_slot;
686 perl_slots *slot;
687
688 if (coro->flags & CF_RUNNING) 791 if (coro->flags & CF_RUNNING)
689 { 792 {
690 slot = &tmp_slot; 793 #define SYM(sym) PL_ ## sym
691 794 CORO_RSS;
692 #define VAR(name,type) slot->name = PL_ ## name;
693 # include "state.h"
694 #undef VAR 795 #undef SYM
695 } 796 }
696 else 797 else
697 slot = coro->slot;
698
699 if (slot)
700 { 798 {
701 rss += sizeof (slot->curstackinfo); 799 #define SYM(sym) coro->slot->sym
702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 800 CORO_RSS;
703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 801 #undef SYM
704 rss += slot->tmps_max * sizeof (SV *);
705 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
706 rss += slot->scopestack_max * sizeof (I32);
707 rss += slot->savestack_max * sizeof (ANY);
708
709#if !PERL_VERSION_ATLEAST (5,10,0)
710 rss += slot->retstack_max * sizeof (OP *);
711#endif
712 } 802 }
713 } 803 }
714 804
715 return rss; 805 return rss;
716} 806}
… …
729#endif 819#endif
730 820
731/* 821/*
732 * This overrides the default magic get method of %SIG elements. 822 * This overrides the default magic get method of %SIG elements.
733 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 823 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
734 * and instead of tryign to save and restore the hash elements, we just provide 824 * and instead of trying to save and restore the hash elements, we just provide
735 * readback here. 825 * readback here.
736 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
737 * not expecting this to actually change the hook. This is a potential problem
738 * when a schedule happens then, but we ignore this.
739 */ 826 */
740static int 827static int
741coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 828coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
742{ 829{
743 const char *s = MgPV_nolen_const (mg); 830 const char *s = MgPV_nolen_const (mg);
… …
796 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 883 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
797 884
798 if (svp) 885 if (svp)
799 { 886 {
800 SV *old = *svp; 887 SV *old = *svp;
801 *svp = newSVsv (sv); 888 *svp = SvOK (sv) ? newSVsv (sv) : 0;
802 SvREFCNT_dec (old); 889 SvREFCNT_dec (old);
803 return 0; 890 return 0;
804 } 891 }
805 } 892 }
806 893
… …
816 903
817static int 904static int
818slf_check_nop (pTHX_ struct CoroSLF *frame) 905slf_check_nop (pTHX_ struct CoroSLF *frame)
819{ 906{
820 return 0; 907 return 0;
908}
909
910static int
911slf_check_repeat (pTHX_ struct CoroSLF *frame)
912{
913 return 1;
821} 914}
822 915
823static UNOP coro_setup_op; 916static UNOP coro_setup_op;
824 917
825static void NOINLINE /* noinline to keep it out of the transfer fast path */ 918static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
832 925
833 PL_runops = RUNOPS_DEFAULT; 926 PL_runops = RUNOPS_DEFAULT;
834 PL_curcop = &PL_compiling; 927 PL_curcop = &PL_compiling;
835 PL_in_eval = EVAL_NULL; 928 PL_in_eval = EVAL_NULL;
836 PL_comppad = 0; 929 PL_comppad = 0;
930 PL_comppad_name = 0;
931 PL_comppad_name_fill = 0;
932 PL_comppad_name_floor = 0;
837 PL_curpm = 0; 933 PL_curpm = 0;
838 PL_curpad = 0; 934 PL_curpad = 0;
839 PL_localizing = 0; 935 PL_localizing = 0;
840 PL_dirty = 0; 936 PL_dirty = 0;
841 PL_restartop = 0; 937 PL_restartop = 0;
842#if PERL_VERSION_ATLEAST (5,10,0) 938#if PERL_VERSION_ATLEAST (5,10,0)
843 PL_parser = 0; 939 PL_parser = 0;
844#endif 940#endif
941 PL_hints = 0;
845 942
846 /* recreate the die/warn hooks */ 943 /* recreate the die/warn hooks */
847 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 944 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
848 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 945 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
849 946
850 GvSV (PL_defgv) = newSV (0); 947 GvSV (PL_defgv) = newSV (0);
851 GvAV (PL_defgv) = coro->args; coro->args = 0; 948 GvAV (PL_defgv) = coro->args; coro->args = 0;
852 GvSV (PL_errgv) = newSV (0); 949 GvSV (PL_errgv) = newSV (0);
853 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 950 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
951 GvHV (PL_hintgv) = 0;
854 PL_rs = newSVsv (GvSV (irsgv)); 952 PL_rs = newSVsv (GvSV (irsgv));
855 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 953 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
856 954
857 { 955 {
858 dSP; 956 dSP;
859 UNOP myop; 957 UNOP myop;
860 958
861 Zero (&myop, 1, UNOP); 959 Zero (&myop, 1, UNOP);
862 myop.op_next = Nullop; 960 myop.op_next = Nullop;
961 myop.op_type = OP_ENTERSUB;
863 myop.op_flags = OPf_WANT_VOID; 962 myop.op_flags = OPf_WANT_VOID;
864 963
865 PUSHMARK (SP); 964 PUSHMARK (SP);
866 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 965 PUSHs ((SV *)coro->startcv);
867 PUTBACK; 966 PUTBACK;
868 PL_op = (OP *)&myop; 967 PL_op = (OP *)&myop;
869 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 968 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
870 SPAGAIN;
871 } 969 }
872 970
873 /* this newly created coroutine might be run on an existing cctx which most 971 /* this newly created coroutine might be run on an existing cctx which most
874 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 972 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
875 */ 973 */
876 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 974 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
877 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 975 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
878 976
879 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 977 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
978 coro_setup_op.op_next = PL_op;
880 coro_setup_op.op_type = OP_CUSTOM; 979 coro_setup_op.op_type = OP_ENTERSUB;
881 coro_setup_op.op_ppaddr = pp_slf; 980 coro_setup_op.op_ppaddr = pp_slf;
882 coro_setup_op.op_next = PL_op; 981 /* no flags etc. required, as an init function won't be called */
883 982
884 PL_op = (OP *)&coro_setup_op; 983 PL_op = (OP *)&coro_setup_op;
885 984
886 /* copy throw, in case it was set before coro_setup */ 985 /* copy throw, in case it was set before coro_setup */
887 coro_throw = coro->throw; 986 CORO_THROW = coro->except;
888} 987}
889 988
890static void 989static void
891coro_destruct (pTHX_ struct coro *coro) 990coro_unwind_stacks (pTHX)
892{ 991{
893 if (!IN_DESTRUCT) 992 if (!IN_DESTRUCT)
894 { 993 {
895 /* restore all saved variables and stuff */ 994 /* restore all saved variables and stuff */
896 LEAVE_SCOPE (0); 995 LEAVE_SCOPE (0);
… …
904 POPSTACK_TO (PL_mainstack); 1003 POPSTACK_TO (PL_mainstack);
905 1004
906 /* unwind main stack */ 1005 /* unwind main stack */
907 dounwind (-1); 1006 dounwind (-1);
908 } 1007 }
1008}
909 1009
910 SvREFCNT_dec (GvSV (PL_defgv)); 1010static void
911 SvREFCNT_dec (GvAV (PL_defgv)); 1011coro_destruct_perl (pTHX_ struct coro *coro)
912 SvREFCNT_dec (GvSV (PL_errgv)); 1012{
913 SvREFCNT_dec (PL_defoutgv); 1013 SV *svf [9];
914 SvREFCNT_dec (PL_rs);
915 SvREFCNT_dec (GvSV (irsgv));
916 1014
917 SvREFCNT_dec (PL_diehook);
918 SvREFCNT_dec (PL_warnhook);
919 1015 {
1016 struct coro *current = SvSTATE_current;
1017
1018 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1019
1020 save_perl (aTHX_ current);
1021 load_perl (aTHX_ coro);
1022
1023 coro_unwind_stacks (aTHX);
1024 coro_destruct_stacks (aTHX);
1025
1026 // now save some sv's to be free'd later
1027 svf [0] = GvSV (PL_defgv);
1028 svf [1] = (SV *)GvAV (PL_defgv);
1029 svf [2] = GvSV (PL_errgv);
1030 svf [3] = (SV *)PL_defoutgv;
1031 svf [4] = PL_rs;
1032 svf [5] = GvSV (irsgv);
1033 svf [6] = (SV *)GvHV (PL_hintgv);
1034 svf [7] = PL_diehook;
1035 svf [8] = PL_warnhook;
1036 assert (9 == sizeof (svf) / sizeof (*svf));
1037
1038 load_perl (aTHX_ current);
1039 }
1040
1041 {
1042 int i;
1043
1044 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1045 SvREFCNT_dec (svf [i]);
1046
920 SvREFCNT_dec (coro->saved_deffh); 1047 SvREFCNT_dec (coro->saved_deffh);
921 SvREFCNT_dec (coro_throw); 1048 SvREFCNT_dec (coro->rouse_cb);
922 1049 SvREFCNT_dec (coro->invoke_cb);
923 coro_destruct_stacks (aTHX); 1050 SvREFCNT_dec (coro->invoke_av);
1051 }
924} 1052}
925 1053
926INLINE void 1054INLINE void
927free_coro_mortal (pTHX) 1055free_coro_mortal (pTHX)
928{ 1056{
… …
936static int 1064static int
937runops_trace (pTHX) 1065runops_trace (pTHX)
938{ 1066{
939 COP *oldcop = 0; 1067 COP *oldcop = 0;
940 int oldcxix = -2; 1068 int oldcxix = -2;
941 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
942 coro_cctx *cctx = coro->cctx;
943 1069
944 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1070 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
945 { 1071 {
946 PERL_ASYNC_CHECK (); 1072 PERL_ASYNC_CHECK ();
947 1073
948 if (cctx->flags & CC_TRACE_ALL) 1074 if (cctx_current->flags & CC_TRACE_ALL)
949 { 1075 {
950 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1076 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
951 { 1077 {
952 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1078 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
953 SV **bot, **top; 1079 SV **bot, **top;
954 AV *av = newAV (); /* return values */ 1080 AV *av = newAV (); /* return values */
955 SV **cb; 1081 SV **cb;
… …
992 1118
993 if (PL_curcop != &PL_compiling) 1119 if (PL_curcop != &PL_compiling)
994 { 1120 {
995 SV **cb; 1121 SV **cb;
996 1122
997 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1123 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
998 { 1124 {
999 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1125 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1000 1126
1001 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1127 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1002 { 1128 {
1003 runops_proc_t old_runops = PL_runops;
1004 dSP; 1129 dSP;
1005 GV *gv = CvGV (cx->blk_sub.cv); 1130 GV *gv = CvGV (cx->blk_sub.cv);
1006 SV *fullname = sv_2mortal (newSV (0)); 1131 SV *fullname = sv_2mortal (newSV (0));
1007 1132
1008 if (isGV (gv)) 1133 if (isGV (gv))
… …
1013 SAVETMPS; 1138 SAVETMPS;
1014 EXTEND (SP, 3); 1139 EXTEND (SP, 3);
1015 PUSHMARK (SP); 1140 PUSHMARK (SP);
1016 PUSHs (&PL_sv_yes); 1141 PUSHs (&PL_sv_yes);
1017 PUSHs (fullname); 1142 PUSHs (fullname);
1018 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1143 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1019 PUTBACK; 1144 PUTBACK;
1020 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1145 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1021 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1146 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1022 SPAGAIN; 1147 SPAGAIN;
1023 FREETMPS; 1148 FREETMPS;
… …
1026 } 1151 }
1027 1152
1028 oldcxix = cxstack_ix; 1153 oldcxix = cxstack_ix;
1029 } 1154 }
1030 1155
1031 if (cctx->flags & CC_TRACE_LINE) 1156 if (cctx_current->flags & CC_TRACE_LINE)
1032 { 1157 {
1033 dSP; 1158 dSP;
1034 1159
1035 PL_runops = RUNOPS_DEFAULT; 1160 PL_runops = RUNOPS_DEFAULT;
1036 ENTER; 1161 ENTER;
… …
1055 1180
1056 TAINT_NOT; 1181 TAINT_NOT;
1057 return 0; 1182 return 0;
1058} 1183}
1059 1184
1060static struct coro_cctx *cctx_ssl_cctx;
1061static struct CoroSLF cctx_ssl_frame; 1185static struct CoroSLF cctx_ssl_frame;
1062 1186
1063static void 1187static void
1064slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1188slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1065{ 1189{
1066 ta->prev = (struct coro *)cctx_ssl_cctx;
1067 ta->next = 0; 1190 ta->prev = 0;
1068} 1191}
1069 1192
1070static int 1193static int
1071slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1194slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1072{ 1195{
1073 *frame = cctx_ssl_frame; 1196 *frame = cctx_ssl_frame;
1074 1197
1075 return 1; /* execute the restored frame - there must be one */ 1198 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1076} 1199}
1077 1200
1078/* initialises PL_top_env and injects a pseudo-slf-call to sett he stacklevel */ 1201/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1079static void NOINLINE 1202static void NOINLINE
1080cctx_prepare (pTHX_ coro_cctx *cctx) 1203cctx_prepare (pTHX)
1081{ 1204{
1082 PL_top_env = &PL_start_env; 1205 PL_top_env = &PL_start_env;
1083 1206
1084 if (cctx->flags & CC_TRACE) 1207 if (cctx_current->flags & CC_TRACE)
1085 PL_runops = runops_trace; 1208 PL_runops = runops_trace;
1086 1209
1087 /* we already must be in an SLF call, there is no other valid way 1210 /* we already must be executing an SLF op, there is no other valid way
1088 * that can lead to creation of a new cctx */ 1211 * that can lead to creation of a new cctx */
1089 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1212 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1090 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1213 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1091 1214
1092 cctx_ssl_cctx = cctx; 1215 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1093 cctx_ssl_frame = slf_frame; 1216 cctx_ssl_frame = slf_frame;
1094 1217
1095 slf_frame.prepare = slf_prepare_set_stacklevel; 1218 slf_frame.prepare = slf_prepare_set_stacklevel;
1096 slf_frame.check = slf_check_set_stacklevel; 1219 slf_frame.check = slf_check_set_stacklevel;
1097} 1220}
… …
1120 /* normally we would need to skip the entersub here */ 1243 /* normally we would need to skip the entersub here */
1121 /* not doing so will re-execute it, which is exactly what we want */ 1244 /* not doing so will re-execute it, which is exactly what we want */
1122 /* PL_nop = PL_nop->op_next */ 1245 /* PL_nop = PL_nop->op_next */
1123 1246
1124 /* inject a fake subroutine call to cctx_init */ 1247 /* inject a fake subroutine call to cctx_init */
1125 cctx_prepare (aTHX_ (coro_cctx *)arg); 1248 cctx_prepare (aTHX);
1126 1249
1127 /* cctx_run is the alternative tail of transfer() */ 1250 /* cctx_run is the alternative tail of transfer() */
1128 transfer_tail (aTHX); 1251 transfer_tail (aTHX);
1129 1252
1130 /* somebody or something will hit me for both perl_run and PL_restartop */ 1253 /* somebody or something will hit me for both perl_run and PL_restartop */
1131 PL_restartop = PL_op; 1254 PL_restartop = PL_op;
1132 perl_run (PL_curinterp); 1255 perl_run (PL_curinterp);
1256 /*
1257 * Unfortunately, there is no way to get at the return values of the
1258 * coro body here, as perl_run destroys these
1259 */
1133 1260
1134 /* 1261 /*
1135 * If perl-run returns we assume exit() was being called or the coro 1262 * If perl-run returns we assume exit() was being called or the coro
1136 * fell off the end, which seems to be the only valid (non-bug) 1263 * fell off the end, which seems to be the only valid (non-bug)
1137 * reason for perl_run to return. We try to exit by jumping to the 1264 * reason for perl_run to return. We try to exit by jumping to the
1138 * bootstrap-time "top" top_env, as we cannot restore the "main" 1265 * bootstrap-time "top" top_env, as we cannot restore the "main"
1139 * coroutine as Coro has no such concept 1266 * coroutine as Coro has no such concept.
1267 * This actually isn't valid with the pthread backend, but OSes requiring
1268 * that backend are too broken to do it in a standards-compliant way.
1140 */ 1269 */
1141 PL_top_env = main_top_env; 1270 PL_top_env = main_top_env;
1142 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1271 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1143 } 1272 }
1144} 1273}
… …
1221cctx_destroy (coro_cctx *cctx) 1350cctx_destroy (coro_cctx *cctx)
1222{ 1351{
1223 if (!cctx) 1352 if (!cctx)
1224 return; 1353 return;
1225 1354
1355 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1356
1226 --cctx_count; 1357 --cctx_count;
1227 coro_destroy (&cctx->cctx); 1358 coro_destroy (&cctx->cctx);
1228 1359
1229 /* coro_transfer creates new, empty cctx's */ 1360 /* coro_transfer creates new, empty cctx's */
1230 if (cctx->sptr) 1361 if (cctx->sptr)
… …
1293 /* TODO: throwing up here is considered harmful */ 1424 /* TODO: throwing up here is considered harmful */
1294 1425
1295 if (expect_true (prev != next)) 1426 if (expect_true (prev != next))
1296 { 1427 {
1297 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1428 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1298 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1429 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1299 1430
1300 if (expect_false (next->flags & CF_RUNNING))
1301 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1302
1303 if (expect_false (next->flags & CF_DESTROYED)) 1431 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1304 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1432 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1305 1433
1306#if !PERL_VERSION_ATLEAST (5,10,0) 1434#if !PERL_VERSION_ATLEAST (5,10,0)
1307 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1435 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1308 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1436 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1309#endif 1437#endif
… …
1315transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1443transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1316{ 1444{
1317 dSTACKLEVEL; 1445 dSTACKLEVEL;
1318 1446
1319 /* sometimes transfer is only called to set idle_sp */ 1447 /* sometimes transfer is only called to set idle_sp */
1320 if (expect_false (!next)) 1448 if (expect_false (!prev))
1321 { 1449 {
1322 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1450 cctx_current->idle_sp = STACKLEVEL;
1323 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1451 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1324 } 1452 }
1325 else if (expect_true (prev != next)) 1453 else if (expect_true (prev != next))
1326 { 1454 {
1327 coro_cctx *prev__cctx; 1455 coro_cctx *cctx_prev;
1328 1456
1329 if (expect_false (prev->flags & CF_NEW)) 1457 if (expect_false (prev->flags & CF_NEW))
1330 { 1458 {
1331 /* create a new empty/source context */ 1459 /* create a new empty/source context */
1332 prev->cctx = cctx_new_empty ();
1333 prev->flags &= ~CF_NEW; 1460 prev->flags &= ~CF_NEW;
1334 prev->flags |= CF_RUNNING; 1461 prev->flags |= CF_RUNNING;
1335 } 1462 }
1336 1463
1337 prev->flags &= ~CF_RUNNING; 1464 prev->flags &= ~CF_RUNNING;
… …
1348 coro_setup (aTHX_ next); 1475 coro_setup (aTHX_ next);
1349 } 1476 }
1350 else 1477 else
1351 load_perl (aTHX_ next); 1478 load_perl (aTHX_ next);
1352 1479
1353 prev__cctx = prev->cctx;
1354
1355 /* possibly untie and reuse the cctx */ 1480 /* possibly untie and reuse the cctx */
1356 if (expect_true ( 1481 if (expect_true (
1357 prev__cctx->idle_sp == (void *)stacklevel 1482 cctx_current->idle_sp == STACKLEVEL
1358 && !(prev__cctx->flags & CC_TRACE) 1483 && !(cctx_current->flags & CC_TRACE)
1359 && !force_cctx 1484 && !force_cctx
1360 )) 1485 ))
1361 { 1486 {
1362 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1487 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1363 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1488 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1364 1489
1365 prev->cctx = 0;
1366
1367 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1490 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1368 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1491 /* without this the next cctx_get might destroy the running cctx while still in use */
1369 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1492 if (expect_false (CCTX_EXPIRED (cctx_current)))
1370 if (!next->cctx) 1493 if (expect_true (!next->cctx))
1371 next->cctx = cctx_get (aTHX); 1494 next->cctx = cctx_get (aTHX);
1372 1495
1373 cctx_put (prev__cctx); 1496 cctx_put (cctx_current);
1374 } 1497 }
1498 else
1499 prev->cctx = cctx_current;
1375 1500
1376 ++next->usecount; 1501 ++next->usecount;
1377 1502
1378 if (expect_true (!next->cctx)) 1503 cctx_prev = cctx_current;
1379 next->cctx = cctx_get (aTHX); 1504 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1380 1505
1381 if (expect_false (prev__cctx != next->cctx)) 1506 next->cctx = 0;
1507
1508 if (expect_false (cctx_prev != cctx_current))
1382 { 1509 {
1383 prev__cctx->top_env = PL_top_env; 1510 cctx_prev->top_env = PL_top_env;
1384 PL_top_env = next->cctx->top_env; 1511 PL_top_env = cctx_current->top_env;
1385 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1512 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1386 } 1513 }
1387 1514
1388 transfer_tail (aTHX); 1515 transfer_tail (aTHX);
1389 } 1516 }
1390} 1517}
… …
1398coro_state_destroy (pTHX_ struct coro *coro) 1525coro_state_destroy (pTHX_ struct coro *coro)
1399{ 1526{
1400 if (coro->flags & CF_DESTROYED) 1527 if (coro->flags & CF_DESTROYED)
1401 return 0; 1528 return 0;
1402 1529
1403 if (coro->on_destroy) 1530 if (coro->on_destroy && !PL_dirty)
1404 coro->on_destroy (aTHX_ coro); 1531 coro->on_destroy (aTHX_ coro);
1405 1532
1406 coro->flags |= CF_DESTROYED; 1533 coro->flags |= CF_DESTROYED;
1407 1534
1408 if (coro->flags & CF_READY) 1535 if (coro->flags & CF_READY)
… …
1412 --coro_nready; 1539 --coro_nready;
1413 } 1540 }
1414 else 1541 else
1415 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1542 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1416 1543
1417 if (coro->mainstack && coro->mainstack != main_mainstack) 1544 if (coro->mainstack
1418 { 1545 && coro->mainstack != main_mainstack
1419 struct coro temp; 1546 && coro->slot
1420 1547 && !PL_dirty)
1421 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1422
1423 save_perl (aTHX_ &temp);
1424 load_perl (aTHX_ coro);
1425
1426 coro_destruct (aTHX_ coro); 1548 coro_destruct_perl (aTHX_ coro);
1427
1428 load_perl (aTHX_ &temp);
1429
1430 coro->slot = 0;
1431 }
1432 1549
1433 cctx_destroy (coro->cctx); 1550 cctx_destroy (coro->cctx);
1551 SvREFCNT_dec (coro->startcv);
1434 SvREFCNT_dec (coro->args); 1552 SvREFCNT_dec (coro->args);
1553 SvREFCNT_dec (CORO_THROW);
1435 1554
1436 if (coro->next) coro->next->prev = coro->prev; 1555 if (coro->next) coro->next->prev = coro->prev;
1437 if (coro->prev) coro->prev->next = coro->next; 1556 if (coro->prev) coro->prev->next = coro->next;
1438 if (coro == coro_first) coro_first = coro->next; 1557 if (coro == coro_first) coro_first = coro->next;
1439 1558
… …
1493 1612
1494 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1613 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1495 TRANSFER (ta, 1); 1614 TRANSFER (ta, 1);
1496} 1615}
1497 1616
1617/*****************************************************************************/
1618/* gensub: simple closure generation utility */
1619
1620#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1621
1622/* create a closure from XS, returns a code reference */
1623/* the arg can be accessed via GENSUB_ARG from the callback */
1624/* the callback must use dXSARGS/XSRETURN */
1625static SV *
1626gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1627{
1628 CV *cv = (CV *)newSV (0);
1629
1630 sv_upgrade ((SV *)cv, SVt_PVCV);
1631
1632 CvANON_on (cv);
1633 CvISXSUB_on (cv);
1634 CvXSUB (cv) = xsub;
1635 GENSUB_ARG = arg;
1636
1637 return newRV_noinc ((SV *)cv);
1638}
1639
1498/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1499 1641
1500INLINE void 1642INLINE void
1501coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1502{ 1644{
1503 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1504}
1505 1646
1506INLINE SV * 1647 SvREFCNT_inc_NN (coro->hv);
1648
1649 coro->next_ready = 0;
1650 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1651 ready [1] = coro;
1652}
1653
1654INLINE struct coro *
1507coro_deq (pTHX) 1655coro_deq (pTHX)
1508{ 1656{
1509 int prio; 1657 int prio;
1510 1658
1511 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1512 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1513 return av_shift (coro_ready [prio]); 1661 struct coro **ready = coro_ready [prio];
1662
1663 if (ready [0])
1664 {
1665 struct coro *coro = ready [0];
1666 ready [0] = coro->next_ready;
1667 return coro;
1668 }
1669 }
1514 1670
1515 return 0; 1671 return 0;
1516} 1672}
1517 1673
1518static int 1674static int
… …
1520{ 1676{
1521 struct coro *coro; 1677 struct coro *coro;
1522 SV *sv_hook; 1678 SV *sv_hook;
1523 void (*xs_hook)(void); 1679 void (*xs_hook)(void);
1524 1680
1525 if (SvROK (coro_sv))
1526 coro_sv = SvRV (coro_sv);
1527
1528 coro = SvSTATE (coro_sv); 1681 coro = SvSTATE (coro_sv);
1529 1682
1530 if (coro->flags & CF_READY) 1683 if (coro->flags & CF_READY)
1531 return 0; 1684 return 0;
1532 1685
… …
1563api_is_ready (pTHX_ SV *coro_sv) 1716api_is_ready (pTHX_ SV *coro_sv)
1564{ 1717{
1565 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1718 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1566} 1719}
1567 1720
1721/* expects to own a reference to next->hv */
1568INLINE void 1722INLINE void
1569prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1723prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1570{ 1724{
1571 SV *prev_sv, *next_sv;
1572
1573 for (;;)
1574 {
1575 next_sv = coro_deq (aTHX);
1576
1577 /* nothing to schedule: call the idle handler */
1578 if (expect_false (!next_sv))
1579 {
1580 dSP;
1581
1582 ENTER;
1583 SAVETMPS;
1584
1585 PUSHMARK (SP);
1586 PUTBACK;
1587 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1588
1589 FREETMPS;
1590 LEAVE;
1591 continue;
1592 }
1593
1594 ta->next = SvSTATE_hv (next_sv);
1595
1596 /* cannot transfer to destroyed coros, skip and look for next */
1597 if (expect_false (ta->next->flags & CF_DESTROYED))
1598 {
1599 SvREFCNT_dec (next_sv);
1600 /* coro_nready has already been taken care of by destroy */
1601 continue;
1602 }
1603
1604 --coro_nready;
1605 break;
1606 }
1607
1608 /* free this only after the transfer */
1609 prev_sv = SvRV (coro_current); 1725 SV *prev_sv = SvRV (coro_current);
1726
1610 ta->prev = SvSTATE_hv (prev_sv); 1727 ta->prev = SvSTATE_hv (prev_sv);
1728 ta->next = next;
1729
1611 TRANSFER_CHECK (*ta); 1730 TRANSFER_CHECK (*ta);
1612 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1731
1613 ta->next->flags &= ~CF_READY;
1614 SvRV_set (coro_current, next_sv); 1732 SvRV_set (coro_current, (SV *)next->hv);
1615 1733
1616 free_coro_mortal (aTHX); 1734 free_coro_mortal (aTHX);
1617 coro_mortal = prev_sv; 1735 coro_mortal = prev_sv;
1618} 1736}
1619 1737
1738static void
1739prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1740{
1741 for (;;)
1742 {
1743 struct coro *next = coro_deq (aTHX);
1744
1745 if (expect_true (next))
1746 {
1747 /* cannot transfer to destroyed coros, skip and look for next */
1748 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1749 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1750 else
1751 {
1752 next->flags &= ~CF_READY;
1753 --coro_nready;
1754
1755 prepare_schedule_to (aTHX_ ta, next);
1756 break;
1757 }
1758 }
1759 else
1760 {
1761 /* nothing to schedule: call the idle handler */
1762 if (SvROK (sv_idle)
1763 && SvOBJECT (SvRV (sv_idle)))
1764 {
1765 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1766 api_ready (aTHX_ SvRV (sv_idle));
1767 --coro_nready;
1768 }
1769 else
1770 {
1771 dSP;
1772
1773 ENTER;
1774 SAVETMPS;
1775
1776 PUSHMARK (SP);
1777 PUTBACK;
1778 call_sv (sv_idle, G_VOID | G_DISCARD);
1779
1780 FREETMPS;
1781 LEAVE;
1782 }
1783 }
1784 }
1785}
1786
1620INLINE void 1787INLINE void
1621prepare_cede (pTHX_ struct coro_transfer_args *ta) 1788prepare_cede (pTHX_ struct coro_transfer_args *ta)
1622{ 1789{
1623 api_ready (aTHX_ coro_current); 1790 api_ready (aTHX_ coro_current);
1624 prepare_schedule (aTHX_ ta); 1791 prepare_schedule (aTHX_ ta);
… …
1643{ 1810{
1644 struct coro_transfer_args ta; 1811 struct coro_transfer_args ta;
1645 1812
1646 prepare_schedule (aTHX_ &ta); 1813 prepare_schedule (aTHX_ &ta);
1647 TRANSFER (ta, 1); 1814 TRANSFER (ta, 1);
1815}
1816
1817static void
1818api_schedule_to (pTHX_ SV *coro_sv)
1819{
1820 struct coro_transfer_args ta;
1821 struct coro *next = SvSTATE (coro_sv);
1822
1823 SvREFCNT_inc_NN (coro_sv);
1824 prepare_schedule_to (aTHX_ &ta, next);
1648} 1825}
1649 1826
1650static int 1827static int
1651api_cede (pTHX) 1828api_cede (pTHX)
1652{ 1829{
… …
1681static void 1858static void
1682api_trace (pTHX_ SV *coro_sv, int flags) 1859api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1860{
1684 struct coro *coro = SvSTATE (coro_sv); 1861 struct coro *coro = SvSTATE (coro_sv);
1685 1862
1863 if (coro->flags & CF_RUNNING)
1864 croak ("cannot enable tracing on a running coroutine, caught");
1865
1686 if (flags & CC_TRACE) 1866 if (flags & CC_TRACE)
1687 { 1867 {
1688 if (!coro->cctx) 1868 if (!coro->cctx)
1689 coro->cctx = cctx_new_run (); 1869 coro->cctx = cctx_new_run ();
1690 else if (!(coro->cctx->flags & CC_TRACE)) 1870 else if (!(coro->cctx->flags & CC_TRACE))
1691 croak ("cannot enable tracing on coroutine with custom stack,"); 1871 croak ("cannot enable tracing on coroutine with custom stack, caught");
1692 1872
1693 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1873 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1694 } 1874 }
1695 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1875 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1696 { 1876 {
… …
1699 if (coro->flags & CF_RUNNING) 1879 if (coro->flags & CF_RUNNING)
1700 PL_runops = RUNOPS_DEFAULT; 1880 PL_runops = RUNOPS_DEFAULT;
1701 else 1881 else
1702 coro->slot->runops = RUNOPS_DEFAULT; 1882 coro->slot->runops = RUNOPS_DEFAULT;
1703 } 1883 }
1884}
1885
1886static void
1887coro_call_on_destroy (pTHX_ struct coro *coro)
1888{
1889 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1890 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1891
1892 if (on_destroyp)
1893 {
1894 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1895
1896 while (AvFILLp (on_destroy) >= 0)
1897 {
1898 dSP; /* don't disturb outer sp */
1899 SV *cb = av_pop (on_destroy);
1900
1901 PUSHMARK (SP);
1902
1903 if (statusp)
1904 {
1905 int i;
1906 AV *status = (AV *)SvRV (*statusp);
1907 EXTEND (SP, AvFILLp (status) + 1);
1908
1909 for (i = 0; i <= AvFILLp (status); ++i)
1910 PUSHs (AvARRAY (status)[i]);
1911 }
1912
1913 PUTBACK;
1914 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1915 }
1916 }
1917}
1918
1919static void
1920slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1921{
1922 int i;
1923 HV *hv = (HV *)SvRV (coro_current);
1924 AV *av = newAV ();
1925
1926 av_extend (av, items - 1);
1927 for (i = 0; i < items; ++i)
1928 av_push (av, SvREFCNT_inc_NN (arg [i]));
1929
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1931
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager);
1934
1935 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat;
1937
1938 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/
1941}
1942
1943/*****************************************************************************/
1944/* async pool handler */
1945
1946static int
1947slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1948{
1949 HV *hv = (HV *)SvRV (coro_current);
1950 struct coro *coro = (struct coro *)frame->data;
1951
1952 if (!coro->invoke_cb)
1953 return 1; /* loop till we have invoke */
1954 else
1955 {
1956 hv_store (hv, "desc", sizeof ("desc") - 1,
1957 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1958
1959 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1960
1961 {
1962 dSP;
1963 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1964 PUTBACK;
1965 }
1966
1967 SvREFCNT_dec (GvAV (PL_defgv));
1968 GvAV (PL_defgv) = coro->invoke_av;
1969 coro->invoke_av = 0;
1970
1971 return 0;
1972 }
1973}
1974
1975static void
1976slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1977{
1978 HV *hv = (HV *)SvRV (coro_current);
1979 struct coro *coro = SvSTATE_hv ((SV *)hv);
1980
1981 if (expect_true (coro->saved_deffh))
1982 {
1983 /* subsequent iteration */
1984 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1985 coro->saved_deffh = 0;
1986
1987 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1988 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1989 {
1990 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1991 coro->invoke_av = newAV ();
1992
1993 frame->prepare = prepare_nop;
1994 }
1995 else
1996 {
1997 av_clear (GvAV (PL_defgv));
1998 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1999
2000 coro->prio = 0;
2001
2002 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2003 api_trace (aTHX_ coro_current, 0);
2004
2005 frame->prepare = prepare_schedule;
2006 av_push (av_async_pool, SvREFCNT_inc (hv));
2007 }
2008 }
2009 else
2010 {
2011 /* first iteration, simply fall through */
2012 frame->prepare = prepare_nop;
2013 }
2014
2015 frame->check = slf_check_pool_handler;
2016 frame->data = (void *)coro;
2017}
2018
2019/*****************************************************************************/
2020/* rouse callback */
2021
2022#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2023
2024static void
2025coro_rouse_callback (pTHX_ CV *cv)
2026{
2027 dXSARGS;
2028 SV *data = (SV *)GENSUB_ARG;
2029
2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2031 {
2032 /* first call, set args */
2033 SV *coro = SvRV (data);
2034 AV *av = newAV ();
2035
2036 SvRV_set (data, (SV *)av);
2037
2038 /* better take a full copy of the arguments */
2039 while (items--)
2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
2044 }
2045
2046 XSRETURN_EMPTY;
2047}
2048
2049static int
2050slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2051{
2052 SV *data = (SV *)frame->data;
2053
2054 if (CORO_THROW)
2055 return 0;
2056
2057 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2058 return 1;
2059
2060 /* now push all results on the stack */
2061 {
2062 dSP;
2063 AV *av = (AV *)SvRV (data);
2064 int i;
2065
2066 EXTEND (SP, AvFILLp (av) + 1);
2067 for (i = 0; i <= AvFILLp (av); ++i)
2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2069
2070 /* we have stolen the elements, so set length to zero and free */
2071 AvFILLp (av) = -1;
2072 av_undef (av);
2073
2074 PUTBACK;
2075 }
2076
2077 return 0;
2078}
2079
2080static void
2081slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 SV *cb;
2084
2085 if (items)
2086 cb = arg [0];
2087 else
2088 {
2089 struct coro *coro = SvSTATE_current;
2090
2091 if (!coro->rouse_cb)
2092 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2093
2094 cb = sv_2mortal (coro->rouse_cb);
2095 coro->rouse_cb = 0;
2096 }
2097
2098 if (!SvROK (cb)
2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2102
2103 {
2104 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */
2105 SV *data = (SV *)GENSUB_ARG;
2106
2107 frame->data = (void *)data;
2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2109 frame->check = slf_check_rouse_wait;
2110 }
2111}
2112
2113static SV *
2114coro_new_rouse_cb (pTHX)
2115{
2116 HV *hv = (HV *)SvRV (coro_current);
2117 struct coro *coro = SvSTATE_hv (hv);
2118 SV *data = newRV_inc ((SV *)hv);
2119 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data);
2120
2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2123
2124 SvREFCNT_dec (coro->rouse_cb);
2125 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2126
2127 return cb;
1704} 2128}
1705 2129
1706/*****************************************************************************/ 2130/*****************************************************************************/
1707/* schedule-like-function opcode (SLF) */ 2131/* schedule-like-function opcode (SLF) */
1708 2132
… …
1755static void 2179static void
1756slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2180slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1757{ 2181{
1758 frame->prepare = prepare_schedule; 2182 frame->prepare = prepare_schedule;
1759 frame->check = slf_check_nop; 2183 frame->check = slf_check_nop;
2184}
2185
2186static void
2187slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2188{
2189 struct coro *next = (struct coro *)slf_frame.data;
2190
2191 SvREFCNT_inc_NN (next->hv);
2192 prepare_schedule_to (aTHX_ ta, next);
2193}
2194
2195static void
2196slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 if (!items)
2199 croak ("Coro::schedule_to expects a coroutine argument, caught");
2200
2201 frame->data = (void *)SvSTATE (arg [0]);
2202 frame->prepare = slf_prepare_schedule_to;
2203 frame->check = slf_check_nop;
2204}
2205
2206static void
2207slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2208{
2209 api_ready (aTHX_ SvRV (coro_current));
2210
2211 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1760} 2212}
1761 2213
1762static void 2214static void
1763slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2215slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1764{ 2216{
… …
1835 } 2287 }
1836 while (slf_frame.check (aTHX_ &slf_frame)); 2288 while (slf_frame.check (aTHX_ &slf_frame));
1837 2289
1838 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2290 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1839 2291
2292 /* exception handling */
2293 if (expect_false (CORO_THROW))
2294 {
2295 SV *exception = sv_2mortal (CORO_THROW);
2296
2297 CORO_THROW = 0;
2298 sv_setsv (ERRSV, exception);
2299 croak (0);
2300 }
2301
1840 /* return value handling - mostly like entersub */ 2302 /* return value handling - mostly like entersub */
1841 /* make sure we put something on the stack in scalar context */ 2303 /* make sure we put something on the stack in scalar context */
1842 if (GIMME_V == G_SCALAR) 2304 if (GIMME_V == G_SCALAR)
1843 { 2305 {
1844 dSP; 2306 dSP;
… …
1850 bot [1] = *sp; 2312 bot [1] = *sp;
1851 2313
1852 SP = bot + 1; 2314 SP = bot + 1;
1853 2315
1854 PUTBACK; 2316 PUTBACK;
1855 }
1856
1857 /* exception handling */
1858 if (expect_false (coro_throw))
1859 {
1860 SV *exception = sv_2mortal (coro_throw);
1861
1862 coro_throw = 0;
1863 sv_setsv (ERRSV, exception);
1864 croak (0);
1865 } 2317 }
1866 2318
1867 return NORMAL; 2319 return NORMAL;
1868} 2320}
1869 2321
… …
1910 } 2362 }
1911 else 2363 else
1912 slf_argc = 0; 2364 slf_argc = 0;
1913 2365
1914 PL_op->op_ppaddr = pp_slf; 2366 PL_op->op_ppaddr = pp_slf;
1915 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2367 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1916 2368
1917 PL_op = (OP *)&slf_restore; 2369 PL_op = (OP *)&slf_restore;
2370}
2371
2372/*****************************************************************************/
2373/* dynamic wind */
2374
2375static void
2376on_enterleave_call (pTHX_ SV *cb)
2377{
2378 dSP;
2379
2380 PUSHSTACK;
2381
2382 PUSHMARK (SP);
2383 PUTBACK;
2384 call_sv (cb, G_VOID | G_DISCARD);
2385 SPAGAIN;
2386
2387 POPSTACK;
2388}
2389
2390static SV *
2391coro_avp_pop_and_free (pTHX_ AV **avp)
2392{
2393 AV *av = *avp;
2394 SV *res = av_pop (av);
2395
2396 if (AvFILLp (av) < 0)
2397 {
2398 *avp = 0;
2399 SvREFCNT_dec (av);
2400 }
2401
2402 return res;
2403}
2404
2405static void
2406coro_pop_on_enter (pTHX_ void *coro)
2407{
2408 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2409 SvREFCNT_dec (cb);
2410}
2411
2412static void
2413coro_pop_on_leave (pTHX_ void *coro)
2414{
2415 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2416 on_enterleave_call (aTHX_ sv_2mortal (cb));
1918} 2417}
1919 2418
1920/*****************************************************************************/ 2419/*****************************************************************************/
1921/* PerlIO::cede */ 2420/* PerlIO::cede */
1922 2421
… …
1991 PerlIOBuf_get_cnt, 2490 PerlIOBuf_get_cnt,
1992 PerlIOBuf_set_ptrcnt, 2491 PerlIOBuf_set_ptrcnt,
1993}; 2492};
1994 2493
1995/*****************************************************************************/ 2494/*****************************************************************************/
2495/* Coro::Semaphore & Coro::Signal */
2496
2497static SV *
2498coro_waitarray_new (pTHX_ int count)
2499{
2500 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2501 AV *av = newAV ();
2502 SV **ary;
2503
2504 /* unfortunately, building manually saves memory */
2505 Newx (ary, 2, SV *);
2506 AvALLOC (av) = ary;
2507#if PERL_VERSION_ATLEAST (5,10,0)
2508 AvARRAY (av) = ary;
2509#else
2510 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2511 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2512 SvPVX ((SV *)av) = (char *)ary;
2513#endif
2514 AvMAX (av) = 1;
2515 AvFILLp (av) = 0;
2516 ary [0] = newSViv (count);
2517
2518 return newRV_noinc ((SV *)av);
2519}
2520
1996/* Coro::Semaphore */ 2521/* semaphore */
1997 2522
1998static void 2523static void
1999coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2524coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2000{ 2525{
2001 SV *count_sv = AvARRAY (av)[0]; 2526 SV *count_sv = AvARRAY (av)[0];
… …
2013 AvARRAY (av)[0] = AvARRAY (av)[1]; 2538 AvARRAY (av)[0] = AvARRAY (av)[1];
2014 AvARRAY (av)[1] = count_sv; 2539 AvARRAY (av)[1] = count_sv;
2015 cb = av_shift (av); 2540 cb = av_shift (av);
2016 2541
2017 if (SvOBJECT (cb)) 2542 if (SvOBJECT (cb))
2543 {
2018 api_ready (aTHX_ cb); 2544 api_ready (aTHX_ cb);
2019 else 2545 --count;
2020 croak ("callbacks not yet supported"); 2546 }
2547 else if (SvTYPE (cb) == SVt_PVCV)
2548 {
2549 dSP;
2550 PUSHMARK (SP);
2551 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2552 PUTBACK;
2553 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2554 }
2021 2555
2022 SvREFCNT_dec (cb); 2556 SvREFCNT_dec (cb);
2023
2024 --count;
2025 } 2557 }
2026} 2558}
2027 2559
2028static void 2560static void
2029coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2561coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2031 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2563 /* call $sem->adjust (0) to possibly wake up some other waiters */
2032 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2564 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2033} 2565}
2034 2566
2035static int 2567static int
2036slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2568slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2037{ 2569{
2038 AV *av = (AV *)frame->data; 2570 AV *av = (AV *)frame->data;
2039 SV *count_sv = AvARRAY (av)[0]; 2571 SV *count_sv = AvARRAY (av)[0];
2040 2572
2573 /* if we are about to throw, don't actually acquire the lock, just throw */
2574 if (CORO_THROW)
2575 return 0;
2041 if (SvIVX (count_sv) > 0) 2576 else if (SvIVX (count_sv) > 0)
2042 { 2577 {
2043 SvSTATE_current->on_destroy = 0; 2578 SvSTATE_current->on_destroy = 0;
2579
2580 if (acquire)
2044 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2581 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2582 else
2583 coro_semaphore_adjust (aTHX_ av, 0);
2584
2045 return 0; 2585 return 0;
2046 } 2586 }
2047 else 2587 else
2048 { 2588 {
2049 int i; 2589 int i;
… …
2058 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2598 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2059 return 1; 2599 return 1;
2060 } 2600 }
2061} 2601}
2062 2602
2063static void 2603static int
2604slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2605{
2606 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2607}
2608
2609static int
2610slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2611{
2612 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2613}
2614
2615static void
2064slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2616slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2065{ 2617{
2066 AV *av = (AV *)SvRV (arg [0]); 2618 AV *av = (AV *)SvRV (arg [0]);
2067 2619
2068 if (SvIVX (AvARRAY (av)[0]) > 0) 2620 if (SvIVX (AvARRAY (av)[0]) > 0)
2069 { 2621 {
2070 frame->data = (void *)av; 2622 frame->data = (void *)av;
2071 frame->prepare = prepare_nop; 2623 frame->prepare = prepare_nop;
2072 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2073 } 2624 }
2074 else 2625 else
2075 { 2626 {
2076 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2627 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2077 2628
2078 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2629 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2079 frame->prepare = prepare_schedule; 2630 frame->prepare = prepare_schedule;
2080 2631
2081 /* to avoid race conditions when a woken-up coro gets terminated */ 2632 /* to avoid race conditions when a woken-up coro gets terminated */
2082 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2633 /* we arrange for a temporary on_destroy that calls adjust (0) */
2083 assert (!SvSTATE_current->on_destroy);//D
2084 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2634 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2085 } 2635 }
2636}
2086 2637
2638static void
2639slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2640{
2641 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2087 frame->check = slf_check_semaphore_down; 2642 frame->check = slf_check_semaphore_down;
2088
2089} 2643}
2090 2644
2091/*****************************************************************************/ 2645static void
2092/* gensub: simple closure generation utility */ 2646slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093
2094#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2095
2096/* create a closure from XS, returns a code reference */
2097/* the arg can be accessed via GENSUB_ARG from the callback */
2098/* the callback must use dXSARGS/XSRETURN */
2099static SV *
2100gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2101{ 2647{
2102 CV *cv = (CV *)newSV (0); 2648 if (items >= 2)
2649 {
2650 /* callback form */
2651 AV *av = (AV *)SvRV (arg [0]);
2652 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2103 2653
2104 sv_upgrade ((SV *)cv, SVt_PVCV); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2105 2655
2106 CvANON_on (cv); 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2107 CvISXSUB_on (cv); 2657 coro_semaphore_adjust (aTHX_ av, 0);
2108 CvXSUB (cv) = xsub;
2109 GENSUB_ARG = arg;
2110 2658
2111 return newRV_noinc ((SV *)cv); 2659 frame->prepare = prepare_nop;
2660 frame->check = slf_check_nop;
2661 }
2662 else
2663 {
2664 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2665 frame->check = slf_check_semaphore_wait;
2666 }
2667}
2668
2669/* signal */
2670
2671static void
2672coro_signal_wake (pTHX_ AV *av, int count)
2673{
2674 SvIVX (AvARRAY (av)[0]) = 0;
2675
2676 /* now signal count waiters */
2677 while (count > 0 && AvFILLp (av) > 0)
2678 {
2679 SV *cb;
2680
2681 /* swap first two elements so we can shift a waiter */
2682 cb = AvARRAY (av)[0];
2683 AvARRAY (av)[0] = AvARRAY (av)[1];
2684 AvARRAY (av)[1] = cb;
2685
2686 cb = av_shift (av);
2687
2688 if (SvTYPE (cb) == SVt_PVCV)
2689 {
2690 dSP;
2691 PUSHMARK (SP);
2692 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2693 PUTBACK;
2694 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2695 }
2696 else
2697 {
2698 api_ready (aTHX_ cb);
2699 sv_setiv (cb, 0); /* signal waiter */
2700 }
2701
2702 SvREFCNT_dec (cb);
2703
2704 --count;
2705 }
2706}
2707
2708static int
2709slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2710{
2711 /* if we are about to throw, also stop waiting */
2712 return SvROK ((SV *)frame->data) && !CORO_THROW;
2713}
2714
2715static void
2716slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2717{
2718 AV *av = (AV *)SvRV (arg [0]);
2719
2720 if (items >= 2)
2721 {
2722 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2725 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else if (SvIVX (AvARRAY (av)[0]))
2732 {
2733 SvIVX (AvARRAY (av)[0]) = 0;
2734 frame->prepare = prepare_nop;
2735 frame->check = slf_check_nop;
2736 }
2737 else
2738 {
2739 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2740
2741 av_push (av, waiter);
2742
2743 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2744 frame->prepare = prepare_schedule;
2745 frame->check = slf_check_signal_wait;
2746 }
2112} 2747}
2113 2748
2114/*****************************************************************************/ 2749/*****************************************************************************/
2115/* Coro::AIO */ 2750/* Coro::AIO */
2116 2751
… …
2131 dXSARGS; 2766 dXSARGS;
2132 AV *state = (AV *)GENSUB_ARG; 2767 AV *state = (AV *)GENSUB_ARG;
2133 SV *coro = av_pop (state); 2768 SV *coro = av_pop (state);
2134 SV *data_sv = newSV (sizeof (struct io_state)); 2769 SV *data_sv = newSV (sizeof (struct io_state));
2135 2770
2136 av_extend (state, items); 2771 av_extend (state, items - 1);
2137 2772
2138 sv_upgrade (data_sv, SVt_PV); 2773 sv_upgrade (data_sv, SVt_PV);
2139 SvCUR_set (data_sv, sizeof (struct io_state)); 2774 SvCUR_set (data_sv, sizeof (struct io_state));
2140 SvPOK_only (data_sv); 2775 SvPOK_only (data_sv);
2141 2776
… …
2166static int 2801static int
2167slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2802slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2168{ 2803{
2169 AV *state = (AV *)frame->data; 2804 AV *state = (AV *)frame->data;
2170 2805
2806 /* if we are about to throw, return early */
2807 /* this does not cancel the aio request, but at least */
2808 /* it quickly returns */
2809 if (CORO_THROW)
2810 return 0;
2811
2171 /* one element that is an RV? repeat! */ 2812 /* one element that is an RV? repeat! */
2172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2813 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2173 return 1; 2814 return 1;
2174 2815
2175 /* restore status */ 2816 /* restore status */
… …
2270 XSRETURN_EMPTY; 2911 XSRETURN_EMPTY;
2271} 2912}
2272 2913
2273/*****************************************************************************/ 2914/*****************************************************************************/
2274 2915
2916#if CORO_CLONE
2917# include "clone.c"
2918#endif
2919
2275MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2920MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2276 2921
2277PROTOTYPES: DISABLE 2922PROTOTYPES: DISABLE
2278 2923
2279BOOT: 2924BOOT:
… …
2283 coro_thx = PERL_GET_CONTEXT; 2928 coro_thx = PERL_GET_CONTEXT;
2284# endif 2929# endif
2285#endif 2930#endif
2286 BOOT_PAGESIZE; 2931 BOOT_PAGESIZE;
2287 2932
2933 cctx_current = cctx_new_empty ();
2934
2288 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2935 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2289 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2936 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2290 2937
2291 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2938 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2292 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2939 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2311 2958
2312 { 2959 {
2313 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2960 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2314 2961
2315 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2962 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2316 hv_store_ent (PL_custom_op_names, slf, 2963 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2317 newSVpv ("coro_slf", 0), 0);
2318 2964
2319 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2965 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2320 hv_store_ent (PL_custom_op_descs, slf, 2966 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2321 newSVpv ("coro schedule like function", 0), 0);
2322 } 2967 }
2323 2968
2324 coroapi.ver = CORO_API_VERSION; 2969 coroapi.ver = CORO_API_VERSION;
2325 coroapi.rev = CORO_API_REVISION; 2970 coroapi.rev = CORO_API_REVISION;
2326 2971
… …
2340 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2985 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2341 2986
2342 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2987 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2343 } 2988 }
2344 2989
2345 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2990 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2346} 2991}
2347 2992
2348SV * 2993SV *
2349new (char *klass, ...) 2994new (char *klass, ...)
2995 ALIAS:
2996 Coro::new = 1
2350 CODE: 2997 CODE:
2351{ 2998{
2352 struct coro *coro; 2999 struct coro *coro;
2353 MAGIC *mg; 3000 MAGIC *mg;
2354 HV *hv; 3001 HV *hv;
3002 CV *cb;
2355 int i; 3003 int i;
3004
3005 if (items > 1)
3006 {
3007 cb = coro_sv_2cv (aTHX_ ST (1));
3008
3009 if (!ix)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
2356 3018
2357 Newz (0, coro, 1, struct coro); 3019 Newz (0, coro, 1, struct coro);
2358 coro->args = newAV (); 3020 coro->args = newAV ();
2359 coro->flags = CF_NEW; 3021 coro->flags = CF_NEW;
2360 3022
… …
2365 coro->hv = hv = newHV (); 3027 coro->hv = hv = newHV ();
2366 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0); 3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2367 mg->mg_flags |= MGf_DUP; 3029 mg->mg_flags |= MGf_DUP;
2368 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 3030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2369 3031
3032 if (items > 1)
3033 {
2370 av_extend (coro->args, items - 1); 3034 av_extend (coro->args, items - 1 + ix - 1);
3035
3036 if (ix)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
2371 for (i = 1; i < items; i++) 3044 for (i = 2; i < items; i++)
2372 av_push (coro->args, newSVsv (ST (i))); 3045 av_push (coro->args, newSVsv (ST (i)));
3046 }
2373} 3047}
2374 OUTPUT: 3048 OUTPUT:
2375 RETVAL 3049 RETVAL
2376 3050
2377void 3051void
… …
2390void 3064void
2391_exit (int code) 3065_exit (int code)
2392 PROTOTYPE: $ 3066 PROTOTYPE: $
2393 CODE: 3067 CODE:
2394 _exit (code); 3068 _exit (code);
3069
3070SV *
3071clone (Coro::State coro)
3072 CODE:
3073{
3074#if CORO_CLONE
3075 struct coro *ncoro = coro_clone (aTHX_ coro);
3076 MAGIC *mg;
3077 /* TODO: too much duplication */
3078 ncoro->hv = newHV ();
3079 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3080 mg->mg_flags |= MGf_DUP;
3081 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3082#else
3083 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3084#endif
3085}
3086 OUTPUT:
3087 RETVAL
2395 3088
2396int 3089int
2397cctx_stacksize (int new_stacksize = 0) 3090cctx_stacksize (int new_stacksize = 0)
2398 PROTOTYPE: ;$ 3091 PROTOTYPE: ;$
2399 CODE: 3092 CODE:
… …
2449 eval = 1 3142 eval = 1
2450 CODE: 3143 CODE:
2451{ 3144{
2452 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3145 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2453 { 3146 {
2454 struct coro temp; 3147 struct coro *current = SvSTATE_current;
2455 3148
2456 if (!(coro->flags & CF_RUNNING)) 3149 if (current != coro)
2457 { 3150 {
2458 PUTBACK; 3151 PUTBACK;
2459 save_perl (aTHX_ &temp); 3152 save_perl (aTHX_ current);
2460 load_perl (aTHX_ coro); 3153 load_perl (aTHX_ coro);
3154 SPAGAIN;
2461 } 3155 }
2462 3156
2463 {
2464 dSP;
2465 ENTER;
2466 SAVETMPS;
2467 PUTBACK;
2468 PUSHSTACK; 3157 PUSHSTACK;
3158
2469 PUSHMARK (SP); 3159 PUSHMARK (SP);
3160 PUTBACK;
2470 3161
2471 if (ix) 3162 if (ix)
2472 eval_sv (coderef, 0); 3163 eval_sv (coderef, 0);
2473 else 3164 else
2474 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3165 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2475 3166
2476 POPSTACK; 3167 POPSTACK;
2477 SPAGAIN; 3168 SPAGAIN;
2478 FREETMPS;
2479 LEAVE;
2480 PUTBACK;
2481 }
2482 3169
2483 if (!(coro->flags & CF_RUNNING)) 3170 if (current != coro)
2484 { 3171 {
3172 PUTBACK;
2485 save_perl (aTHX_ coro); 3173 save_perl (aTHX_ coro);
2486 load_perl (aTHX_ &temp); 3174 load_perl (aTHX_ current);
2487 SPAGAIN; 3175 SPAGAIN;
2488 } 3176 }
2489 } 3177 }
2490} 3178}
2491 3179
… …
2495 ALIAS: 3183 ALIAS:
2496 is_ready = CF_READY 3184 is_ready = CF_READY
2497 is_running = CF_RUNNING 3185 is_running = CF_RUNNING
2498 is_new = CF_NEW 3186 is_new = CF_NEW
2499 is_destroyed = CF_DESTROYED 3187 is_destroyed = CF_DESTROYED
3188 is_suspended = CF_SUSPENDED
2500 CODE: 3189 CODE:
2501 RETVAL = boolSV (coro->flags & ix); 3190 RETVAL = boolSV (coro->flags & ix);
2502 OUTPUT: 3191 OUTPUT:
2503 RETVAL 3192 RETVAL
2504 3193
… …
2506throw (Coro::State self, SV *throw = &PL_sv_undef) 3195throw (Coro::State self, SV *throw = &PL_sv_undef)
2507 PROTOTYPE: $;$ 3196 PROTOTYPE: $;$
2508 CODE: 3197 CODE:
2509{ 3198{
2510 struct coro *current = SvSTATE_current; 3199 struct coro *current = SvSTATE_current;
2511 SV **throwp = self == current ? &coro_throw : &self->throw; 3200 SV **throwp = self == current ? &CORO_THROW : &self->except;
2512 SvREFCNT_dec (*throwp); 3201 SvREFCNT_dec (*throwp);
3202 SvGETMAGIC (throw);
2513 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3203 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2514} 3204}
2515 3205
2516void 3206void
2517api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3207api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2520 3210
2521SV * 3211SV *
2522has_cctx (Coro::State coro) 3212has_cctx (Coro::State coro)
2523 PROTOTYPE: $ 3213 PROTOTYPE: $
2524 CODE: 3214 CODE:
2525 RETVAL = boolSV (!!coro->cctx); 3215 /* maybe manage the running flag differently */
3216 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2526 OUTPUT: 3217 OUTPUT:
2527 RETVAL 3218 RETVAL
2528 3219
2529int 3220int
2530is_traced (Coro::State coro) 3221is_traced (Coro::State coro)
… …
2550 3241
2551void 3242void
2552force_cctx () 3243force_cctx ()
2553 PROTOTYPE: 3244 PROTOTYPE:
2554 CODE: 3245 CODE:
2555 SvSTATE_current->cctx->idle_sp = 0; 3246 cctx_current->idle_sp = 0;
2556 3247
2557void 3248void
2558swap_defsv (Coro::State self) 3249swap_defsv (Coro::State self)
2559 PROTOTYPE: $ 3250 PROTOTYPE: $
2560 ALIAS: 3251 ALIAS:
… …
2568 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3259 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2569 3260
2570 SV *tmp = *src; *src = *dst; *dst = tmp; 3261 SV *tmp = *src; *src = *dst; *dst = tmp;
2571 } 3262 }
2572 3263
3264void
3265cancel (Coro::State self)
3266 CODE:
3267 coro_state_destroy (aTHX_ self);
3268 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3269
2573 3270
2574MODULE = Coro::State PACKAGE = Coro 3271MODULE = Coro::State PACKAGE = Coro
2575 3272
2576BOOT: 3273BOOT:
2577{ 3274{
2578 int i;
2579
2580 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2581 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3275 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2582 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3276 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2583 3277 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3278 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2584 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3279 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2585 SvREADONLY_on (coro_current); 3280 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3281 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3282 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3283 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3284
3285 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3286 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3287 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3288 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2586 3289
2587 coro_stash = gv_stashpv ("Coro", TRUE); 3290 coro_stash = gv_stashpv ("Coro", TRUE);
2588 3291
2589 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3292 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2590 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3293 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2591 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3294 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2592 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3295 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2593 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3296 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2594 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3297 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2595
2596 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2597 coro_ready[i] = newAV ();
2598 3298
2599 { 3299 {
2600 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3300 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2601 3301
2602 coroapi.schedule = api_schedule; 3302 coroapi.schedule = api_schedule;
3303 coroapi.schedule_to = api_schedule_to;
2603 coroapi.cede = api_cede; 3304 coroapi.cede = api_cede;
2604 coroapi.cede_notself = api_cede_notself; 3305 coroapi.cede_notself = api_cede_notself;
2605 coroapi.ready = api_ready; 3306 coroapi.ready = api_ready;
2606 coroapi.is_ready = api_is_ready; 3307 coroapi.is_ready = api_is_ready;
2607 coroapi.nready = coro_nready; 3308 coroapi.nready = coro_nready;
2608 coroapi.current = coro_current; 3309 coroapi.current = coro_current;
2609 3310
2610 GCoroAPI = &coroapi; 3311 /*GCoroAPI = &coroapi;*/
2611 sv_setiv (sv, (IV)&coroapi); 3312 sv_setiv (sv, (IV)&coroapi);
2612 SvREADONLY_on (sv); 3313 SvREADONLY_on (sv);
2613 } 3314 }
2614} 3315}
3316
3317void
3318terminate (...)
3319 CODE:
3320 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2615 3321
2616void 3322void
2617schedule (...) 3323schedule (...)
2618 CODE: 3324 CODE:
2619 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3325 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3326
3327void
3328schedule_to (...)
3329 CODE:
3330 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3331
3332void
3333cede_to (...)
3334 CODE:
3335 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2620 3336
2621void 3337void
2622cede (...) 3338cede (...)
2623 CODE: 3339 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_cede); 3340 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2638void 3354void
2639_set_readyhook (SV *hook) 3355_set_readyhook (SV *hook)
2640 PROTOTYPE: $ 3356 PROTOTYPE: $
2641 CODE: 3357 CODE:
2642 SvREFCNT_dec (coro_readyhook); 3358 SvREFCNT_dec (coro_readyhook);
3359 SvGETMAGIC (hook);
2643 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3360 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2644 3361
2645int 3362int
2646prio (Coro::State coro, int newprio = 0) 3363prio (Coro::State coro, int newprio = 0)
2647 PROTOTYPE: $;$ 3364 PROTOTYPE: $;$
… …
2654 if (items > 1) 3371 if (items > 1)
2655 { 3372 {
2656 if (ix) 3373 if (ix)
2657 newprio = coro->prio - newprio; 3374 newprio = coro->prio - newprio;
2658 3375
2659 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3376 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2660 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3377 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2661 3378
2662 coro->prio = newprio; 3379 coro->prio = newprio;
2663 } 3380 }
2664} 3381}
2665 OUTPUT: 3382 OUTPUT:
… …
2679 CODE: 3396 CODE:
2680 RETVAL = coro_nready; 3397 RETVAL = coro_nready;
2681 OUTPUT: 3398 OUTPUT:
2682 RETVAL 3399 RETVAL
2683 3400
2684# for async_pool speedup
2685void 3401void
2686_pool_1 (SV *cb) 3402suspend (Coro::State self)
3403 PROTOTYPE: $
2687 CODE: 3404 CODE:
2688{ 3405 self->flags |= CF_SUSPENDED;
2689 HV *hv = (HV *)SvRV (coro_current);
2690 struct coro *coro = SvSTATE_hv ((SV *)hv);
2691 AV *defav = GvAV (PL_defgv);
2692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2693 AV *invoke_av;
2694 int i, len;
2695 3406
2696 if (!invoke) 3407void
3408resume (Coro::State self)
3409 PROTOTYPE: $
3410 CODE:
3411 self->flags &= ~CF_SUSPENDED;
3412
3413void
3414_pool_handler (...)
3415 CODE:
3416 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3417
3418void
3419async_pool (SV *cv, ...)
3420 PROTOTYPE: &@
3421 PPCODE:
3422{
3423 HV *hv = (HV *)av_pop (av_async_pool);
3424 AV *av = newAV ();
3425 SV *cb = ST (0);
3426 int i;
3427
3428 av_extend (av, items - 2);
3429 for (i = 1; i < items; ++i)
3430 av_push (av, SvREFCNT_inc_NN (ST (i)));
3431
3432 if ((SV *)hv == &PL_sv_undef)
2697 { 3433 {
2698 SV *old = PL_diehook; 3434 PUSHMARK (SP);
2699 PL_diehook = 0; 3435 EXTEND (SP, 2);
2700 SvREFCNT_dec (old); 3436 PUSHs (sv_Coro);
2701 croak ("\3async_pool terminate\2\n"); 3437 PUSHs ((SV *)cv_pool_handler);
3438 PUTBACK;
3439 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3440 SPAGAIN;
3441
3442 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
2702 } 3443 }
2703 3444
2704 SvREFCNT_dec (coro->saved_deffh);
2705 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2706
2707 hv_store (hv, "desc", sizeof ("desc") - 1,
2708 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2709
2710 invoke_av = (AV *)SvRV (invoke);
2711 len = av_len (invoke_av);
2712
2713 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2714
2715 if (len > 0)
2716 { 3445 {
2717 av_fill (defav, len - 1); 3446 struct coro *coro = SvSTATE_hv (hv);
2718 for (i = 0; i < len; ++i) 3447
2719 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3448 assert (!coro->invoke_cb);
3449 assert (!coro->invoke_av);
3450 coro->invoke_cb = SvREFCNT_inc (cb);
3451 coro->invoke_av = av;
2720 } 3452 }
3453
3454 api_ready (aTHX_ (SV *)hv);
3455
3456 if (GIMME_V != G_VOID)
3457 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3458 else
3459 SvREFCNT_dec (hv);
2721} 3460}
3461
3462SV *
3463rouse_cb ()
3464 PROTOTYPE:
3465 CODE:
3466 RETVAL = coro_new_rouse_cb (aTHX);
3467 OUTPUT:
3468 RETVAL
2722 3469
2723void 3470void
2724_pool_2 (SV *cb) 3471rouse_wait (...)
3472 PROTOTYPE: ;$
3473 PPCODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3475
3476void
3477on_enter (SV *block)
3478 ALIAS:
3479 on_leave = 1
3480 PROTOTYPE: &
2725 CODE: 3481 CODE:
2726{ 3482{
2727 HV *hv = (HV *)SvRV (coro_current);
2728 struct coro *coro = SvSTATE_hv ((SV *)hv); 3483 struct coro *coro = SvSTATE_current;
3484 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2729 3485
2730 sv_setsv (cb, &PL_sv_undef); 3486 block = (SV *)coro_sv_2cv (aTHX_ block);
2731 3487
2732 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3488 if (!*avp)
2733 coro->saved_deffh = 0; 3489 *avp = newAV ();
2734 3490
2735 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3491 av_push (*avp, SvREFCNT_inc (block));
2736 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2737 {
2738 SV *old = PL_diehook;
2739 PL_diehook = 0;
2740 SvREFCNT_dec (old);
2741 croak ("\3async_pool terminate\2\n");
2742 }
2743 3492
2744 av_clear (GvAV (PL_defgv)); 3493 if (!ix)
2745 hv_store (hv, "desc", sizeof ("desc") - 1, 3494 on_enterleave_call (aTHX_ block);
2746 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2747 3495
2748 coro->prio = 0; 3496 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2749 3497 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2750 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3498 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2751 api_trace (aTHX_ coro_current, 0);
2752
2753 av_push (av_async_pool, newSVsv (coro_current));
2754} 3499}
2755 3500
2756 3501
2757MODULE = Coro::State PACKAGE = PerlIO::cede 3502MODULE = Coro::State PACKAGE = PerlIO::cede
2758 3503
… …
2761 3506
2762 3507
2763MODULE = Coro::State PACKAGE = Coro::Semaphore 3508MODULE = Coro::State PACKAGE = Coro::Semaphore
2764 3509
2765SV * 3510SV *
2766new (SV *klass, SV *count_ = 0) 3511new (SV *klass, SV *count = 0)
2767 CODE: 3512 CODE:
2768{ 3513{
2769 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3514 int semcnt = 1;
2770 AV *av = newAV ();
2771 SV **ary;
2772 3515
2773 /* unfortunately, building manually saves memory */ 3516 if (count)
2774 Newx (ary, 2, SV *); 3517 {
2775 AvALLOC (av) = ary; 3518 SvGETMAGIC (count);
2776 AvARRAY (av) = ary;
2777 AvMAX (av) = 1;
2778 AvFILLp (av) = 0;
2779 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2780 3519
2781 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3520 if (SvOK (count))
3521 semcnt = SvIV (count);
3522 }
3523
3524 RETVAL = sv_bless (
3525 coro_waitarray_new (aTHX_ semcnt),
3526 GvSTASH (CvGV (cv))
3527 );
2782} 3528}
3529 OUTPUT:
3530 RETVAL
3531
3532# helper for Coro::Channel and others
3533SV *
3534_alloc (int count)
3535 CODE:
3536 RETVAL = coro_waitarray_new (aTHX_ count);
2783 OUTPUT: 3537 OUTPUT:
2784 RETVAL 3538 RETVAL
2785 3539
2786SV * 3540SV *
2787count (SV *self) 3541count (SV *self)
… …
2796 adjust = 1 3550 adjust = 1
2797 CODE: 3551 CODE:
2798 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3552 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2799 3553
2800void 3554void
2801down (SV *self) 3555down (...)
2802 CODE: 3556 CODE:
2803 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3557 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3558
3559void
3560wait (...)
3561 CODE:
3562 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2804 3563
2805void 3564void
2806try (SV *self) 3565try (SV *self)
2807 PPCODE: 3566 PPCODE:
2808{ 3567{
… …
2820 XSRETURN_NO; 3579 XSRETURN_NO;
2821} 3580}
2822 3581
2823void 3582void
2824waiters (SV *self) 3583waiters (SV *self)
2825 CODE: 3584 PPCODE:
2826{ 3585{
2827 AV *av = (AV *)SvRV (self); 3586 AV *av = (AV *)SvRV (self);
3587 int wcount = AvFILLp (av) + 1 - 1;
2828 3588
2829 if (GIMME_V == G_SCALAR) 3589 if (GIMME_V == G_SCALAR)
2830 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3590 XPUSHs (sv_2mortal (newSViv (wcount)));
2831 else 3591 else
2832 { 3592 {
2833 int i; 3593 int i;
2834 EXTEND (SP, AvFILLp (av) + 1 - 1); 3594 EXTEND (SP, wcount);
2835 for (i = 1; i <= AvFILLp (av); ++i) 3595 for (i = 1; i <= wcount; ++i)
2836 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3596 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2837 } 3597 }
2838} 3598}
3599
3600MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3601
3602void
3603_may_delete (SV *sem, int count, int extra_refs)
3604 PPCODE:
3605{
3606 AV *av = (AV *)SvRV (sem);
3607
3608 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3609 && AvFILLp (av) == 0 /* no waiters, just count */
3610 && SvIV (AvARRAY (av)[0]) == count)
3611 XSRETURN_YES;
3612
3613 XSRETURN_NO;
3614}
3615
3616MODULE = Coro::State PACKAGE = Coro::Signal
3617
3618SV *
3619new (SV *klass)
3620 CODE:
3621 RETVAL = sv_bless (
3622 coro_waitarray_new (aTHX_ 0),
3623 GvSTASH (CvGV (cv))
3624 );
3625 OUTPUT:
3626 RETVAL
3627
3628void
3629wait (...)
3630 CODE:
3631 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3632
3633void
3634broadcast (SV *self)
3635 CODE:
3636{
3637 AV *av = (AV *)SvRV (self);
3638 coro_signal_wake (aTHX_ av, AvFILLp (av));
3639}
3640
3641void
3642send (SV *self)
3643 CODE:
3644{
3645 AV *av = (AV *)SvRV (self);
3646
3647 if (AvFILLp (av))
3648 coro_signal_wake (aTHX_ av, 1);
3649 else
3650 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3651}
3652
3653IV
3654awaited (SV *self)
3655 CODE:
3656 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3657 OUTPUT:
3658 RETVAL
2839 3659
2840 3660
2841MODULE = Coro::State PACKAGE = Coro::AnyEvent 3661MODULE = Coro::State PACKAGE = Coro::AnyEvent
2842 3662
2843BOOT: 3663BOOT:
… …
2871 3691
2872void 3692void
2873_register (char *target, char *proto, SV *req) 3693_register (char *target, char *proto, SV *req)
2874 CODE: 3694 CODE:
2875{ 3695{
2876 HV *st; 3696 CV *req_cv = coro_sv_2cv (aTHX_ req);
2877 GV *gvp;
2878 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2879 /* newXSproto doesn't return the CV on 5.8 */ 3697 /* newXSproto doesn't return the CV on 5.8 */
2880 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3698 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2881 sv_setpv ((SV *)slf_cv, proto); 3699 sv_setpv ((SV *)slf_cv, proto);
2882 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3700 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2883} 3701}

Diff Legend

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