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

Diff Legend

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