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.327 by root, Mon Nov 24 06:07:16 2008 UTC vs.
Revision 1.372 by root, Thu Oct 1 23:50:23 2009 UTC

6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103#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
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
133#else 74#else
134# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
136#endif 77#endif
137 78
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
164static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
190static SV *sv_pool_size; 142static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 143static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 144static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 145static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 146static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 147
197/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
198static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
199 156
200static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
202 159
203enum { 160enum {
238enum { 195enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 196 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 201};
244 202
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 203/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 204typedef struct
247{ 205{
260/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
261struct coro { 219struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 221 coro_cctx *cctx;
264 222
223 /* ready queue */
224 struct coro *next_ready;
225
265 /* state data */ 226 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 228 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
269 230
285 /* async_pool */ 246 /* async_pool */
286 SV *saved_deffh; 247 SV *saved_deffh;
287 SV *invoke_cb; 248 SV *invoke_cb;
288 AV *invoke_av; 249 AV *invoke_av;
289 250
251 /* on_enter/on_leave */
252 AV *on_enter;
253 AV *on_leave;
254
255 /* times */
256 coro_ts t_cpu, t_real;
257
290 /* linked list */ 258 /* linked list */
291 struct coro *next, *prev; 259 struct coro *next, *prev;
292}; 260};
293 261
294typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
299/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
300static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
301 269
302/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
303 271
304#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
305#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
306#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
307#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
308#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
309#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
310 278
311/* for Coro.pm */ 279/* for Coro.pm */
312static SV *coro_current; 280static SV *coro_current;
313static SV *coro_readyhook; 281static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 284static struct coro *coro_first;
317#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (pTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
318 306
319/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
320 308
321static SV * 309static SV *
322coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
346 get_hv (name, create); 334 get_hv (name, create);
347#endif 335#endif
348 return get_hv (name, create); 336 return get_hv (name, create);
349} 337}
350 338
351/* may croak */ 339INLINE void
352INLINE CV * 340coro_times_update ()
353coro_sv_2cv (pTHX_ SV *sv)
354{ 341{
342#ifdef coro_clock_gettime
343 struct timespec ts;
344
345 ts.tv_sec = ts.tv_nsec = 0;
346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
348
349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
384}
385
386/*****************************************************************************/
387/* magic glue */
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391
392#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \
395 : mg_find (sv, type))
396
397#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \
400 : 0)
401
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404
405INLINE struct coro *
406SvSTATE_ (pTHX_ SV *coro)
407{
355 HV *st; 408 HV *stash;
356 GV *gvp; 409 MAGIC *mg;
357 return sv_2cv (sv, &st, &gvp, 0); 410
411 if (SvROK (coro))
412 coro = SvRV (coro);
413
414 if (expect_false (SvTYPE (coro) != SVt_PVHV))
415 croak ("Coro::State object required");
416
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr;
358} 427}
428
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430
431/* faster than SvSTATE, but expects a coroutine hv */
432#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434
435/*****************************************************************************/
436/* padlist management and caching */
359 437
360static AV * 438static AV *
361coro_derive_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
362{ 440{
363 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 450#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 452 --AvFILLp (padlist);
375 453
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
378 456
379 return newpadlist; 457 return newpadlist;
380} 458}
381 459
382static void 460static void
383free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
384{ 462{
385 /* may be during global destruction */ 463 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
387 { 465 {
388 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
389 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
390 { 469 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
392 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
393 { 472 I32 j = AvFILLp (av);
394 SV *sv; 473
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
396 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
397
398 SvREFCNT_dec (*svp);
399 }
400 } 479 }
401 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
402 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
403 } 485 }
404} 486}
405 487
406static int 488static int
407coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
408{ 490{
409 AV *padlist; 491 AV *padlist;
410 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
411 497
412 /* casting is fun. */ 498 /* casting is fun. */
413 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
414 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
415 501
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 503
418 return 0; 504 return 0;
419} 505}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 506
424static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 508 0, 0, 0, 0,
426 coro_cv_free 509 coro_cv_free
427}; 510};
428
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471 511
472/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
473static void 513static void
474get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
475{ 515{
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504 544
505 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
506 546
507 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
509 549
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 551}
512 552
513/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
514 557
515static void 558static void
516load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
517{ 560{
518 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
546 PUTBACK; 589 PUTBACK;
547 } 590 }
548 591
549 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 593 CORO_THROW = c->except;
594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
603 if (expect_false (c->on_enter))
604 {
605 int i;
606
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 }
551} 610}
552 611
553static void 612static void
554save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
555{ 614{
615 if (expect_false (c->on_leave))
616 {
617 int i;
618
619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
629 }
630
556 c->except = CORO_THROW; 631 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
558 633
559 { 634 {
560 dSP; 635 dSP;
573 { 648 {
574 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
575 { 650 {
576 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
577 652
578 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
579 { 654 {
580 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
581 656
582 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
583 { 658 {
607 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
608 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
609 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
610 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
611 { 686 {
612 int i; 687 unsigned int i;
613 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
614 CXINC; 689 CXINC;
615 } 690 }
616 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
617 692
759#endif 834#endif
760 835
761/* 836/*
762 * This overrides the default magic get method of %SIG elements. 837 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 839 * and instead of trying to save and restore the hash elements, we just provide
765 * readback here. 840 * readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 841 */
770static int 842static int
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 844{
773 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 899
828 if (svp) 900 if (svp)
829 { 901 {
830 SV *old = *svp; 902 SV *old = *svp;
831 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
833 return 0; 905 return 0;
834 } 906 }
835 } 907 }
836 908
925 997
926 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
927 999
928 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
929 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
930}
931 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
932static void 1010static void
933coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
934{ 1012{
935 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
936 { 1014 {
937 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
946 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
947 1025
948 /* unwind main stack */ 1026 /* unwind main stack */
949 dounwind (-1); 1027 dounwind (-1);
950 } 1028 }
1029}
951 1030
952 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
955 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 1035
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
1046
1047 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs;
1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1058
1059 load_perl (aTHX_ current);
1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
963 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1070 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1071 SvREFCNT_dec (coro->invoke_av);
967 1072 }
968 coro_destruct_stacks (aTHX);
969} 1073}
970 1074
971INLINE void 1075INLINE void
972free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
973{ 1077{
1170 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1171 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1172 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1173 /* 1277 /*
1174 * Unfortunately, there is no way to get at the return values of the 1278 * Unfortunately, there is no way to get at the return values of the
1175 * coro body here, as perl_run destroys these 1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1176 */ 1281 */
1177 1282
1178 /* 1283 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1181 * reason for perl_run to return. We try to exit by jumping to the 1286 * reason for perl_run to return. We try to exit by jumping to the
1182 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1183 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1184 */ 1291 */
1185 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1186 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1187 } 1294 }
1188} 1295}
1265cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1266{ 1373{
1267 if (!cctx) 1374 if (!cctx)
1268 return; 1375 return;
1269 1376
1270 assert (cctx != cctx_current);//D temporary 1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1271 1378
1272 --cctx_count; 1379 --cctx_count;
1273 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1274 1381
1275 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1339 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1340 1447
1341 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1342 { 1449 {
1343 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1344 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1345 1452
1346 if (expect_false (next->flags & CF_RUNNING))
1347 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1348
1349 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1350 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1351 1455
1352#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1353 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1354 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1355#endif 1459#endif
1393 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1394 } 1498 }
1395 else 1499 else
1396 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1397 1501
1398 assert (!prev->cctx);//D temporary
1399
1400 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1401 if (expect_true ( 1503 if (expect_true (
1402 cctx_current->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1403 && !(cctx_current->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1404 && !force_cctx 1506 && !force_cctx
1445coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1446{ 1548{
1447 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1448 return 0; 1550 return 0;
1449 1551
1450 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1451 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1452 1554
1453 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1454 1556
1455 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
1459 --coro_nready; 1561 --coro_nready;
1460 } 1562 }
1461 else 1563 else
1462 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1463 1565
1464 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1465 { 1567 && coro->mainstack != main_mainstack
1466 struct coro temp; 1568 && coro->slot
1467 1569 && !PL_dirty)
1468 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1469
1470 save_perl (aTHX_ &temp);
1471 load_perl (aTHX_ coro);
1472
1473 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1474
1475 load_perl (aTHX_ &temp);
1476
1477 coro->slot = 0;
1478 }
1479 1571
1480 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1481 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1482 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1483 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
1542 1634
1543 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1544 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1545} 1637}
1546 1638
1547/*****************************************************************************/
1548/* gensub: simple closure generation utility */
1549
1550#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1551
1552/* create a closure from XS, returns a code reference */
1553/* the arg can be accessed via GENSUB_ARG from the callback */
1554/* the callback must use dXSARGS/XSRETURN */
1555static SV *
1556gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1557{
1558 CV *cv = (CV *)newSV (0);
1559
1560 sv_upgrade ((SV *)cv, SVt_PVCV);
1561
1562 CvANON_on (cv);
1563 CvISXSUB_on (cv);
1564 CvXSUB (cv) = xsub;
1565 GENSUB_ARG = arg;
1566
1567 return newRV_noinc ((SV *)cv);
1568}
1569
1570/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1571 1640
1572INLINE void 1641INLINE void
1573coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1574{ 1643{
1575 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1576}
1577 1645
1578INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1579coro_deq (pTHX) 1654coro_deq (pTHX)
1580{ 1655{
1581 int prio; 1656 int prio;
1582 1657
1583 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1584 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1585 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1586 1669
1587 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1588} 1688}
1589 1689
1590static int 1690static int
1591api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1592{ 1692{
1593 struct coro *coro;
1594 SV *sv_hook;
1595 void (*xs_hook)(void);
1596
1597 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1598 1694
1599 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1600 return 0; 1696 return 0;
1601 1697
1602 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1603 1699
1604 sv_hook = coro_nready ? 0 : coro_readyhook;
1605 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1606
1607 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1608 ++coro_nready;
1609 1701
1610 if (sv_hook) 1702 if (!coro_nready++)
1611 { 1703 if (coroapi.readyhook)
1612 dSP; 1704 coroapi.readyhook ();
1613
1614 ENTER;
1615 SAVETMPS;
1616
1617 PUSHMARK (SP);
1618 PUTBACK;
1619 call_sv (sv_hook, G_VOID | G_DISCARD);
1620
1621 FREETMPS;
1622 LEAVE;
1623 }
1624
1625 if (xs_hook)
1626 xs_hook ();
1627 1705
1628 return 1; 1706 return 1;
1629} 1707}
1630 1708
1631static int 1709static int
1654static void 1732static void
1655prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1656{ 1734{
1657 for (;;) 1735 for (;;)
1658 { 1736 {
1659 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1660 1738
1661 if (expect_true (next_sv)) 1739 if (expect_true (next))
1662 { 1740 {
1663 struct coro *next = SvSTATE_hv (next_sv);
1664
1665 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1666 if (expect_false (next->flags & CF_DESTROYED)) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1667 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1668 else 1744 else
1669 { 1745 {
1670 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1671 --coro_nready; 1747 --coro_nready;
1672 1748
1684 api_ready (aTHX_ SvRV (sv_idle)); 1760 api_ready (aTHX_ SvRV (sv_idle));
1685 --coro_nready; 1761 --coro_nready;
1686 } 1762 }
1687 else 1763 else
1688 { 1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1689 dSP; 1766 dSP;
1690 1767
1691 ENTER; 1768 ENTER;
1692 SAVETMPS; 1769 SAVETMPS;
1693 1770
1839{ 1916{
1840 int i; 1917 int i;
1841 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1842 AV *av = newAV (); 1919 AV *av = newAV ();
1843 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1844 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1845 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1846 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1847 1929
1848 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1849 1931
1850 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1851 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
1852 1934
1853 frame->prepare = prepare_schedule; 1935 frame->prepare = prepare_schedule;
1854 frame->check = slf_check_repeat; 1936 frame->check = slf_check_repeat;
1937
1938 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/
1855} 1941}
1856 1942
1857/*****************************************************************************/ 1943/*****************************************************************************/
1858/* async pool handler */ 1944/* async pool handler */
1859 1945
1937 2023
1938static void 2024static void
1939coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1940{ 2026{
1941 dXSARGS; 2027 dXSARGS;
1942 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1943 2029
1944 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1945 { 2031 {
1946 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data);
1947 AV *av = newAV (); 2034 AV *av = newAV ();
1948 SV *coro = SvRV (data);
1949 2035
1950 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1951 api_ready (aTHX_ coro);
1952 SvREFCNT_dec (coro);
1953 2037
1954 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
1955 while (items--) 2039 while (items--)
1956 av_store (av, items, newSVsv (ST (items))); 2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
1957 } 2044 }
1958 2045
1959 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
1960} 2047}
1961 2048
1978 2065
1979 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
1980 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
1981 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1982 2069
1983 /* we have stolen the elements, so ste length to zero and free */ 2070 /* we have stolen the elements, so set length to zero and free */
1984 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
1985 av_undef (av); 2072 av_undef (av);
1986 2073
1987 PUTBACK; 2074 PUTBACK;
1988 } 2075 }
2012 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2013 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2014 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2015 2102
2016 { 2103 {
2017 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2018 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2019 2106
2020 frame->data = (void *)data; 2107 frame->data = (void *)data;
2021 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2022 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2023 } 2110 }
2027coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2028{ 2115{
2029 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2030 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2031 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2032 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2033 2120
2034 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2035 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2036 2123
2037 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2244 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2245 && PL_op->op_ppaddr != pp_slf) 2332 && PL_op->op_ppaddr != pp_slf)
2246 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2247 2334
2248 CvFLAGS (cv) |= CVf_SLF; 2335 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2249 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2337 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2250 slf_cv = cv; 2338 slf_cv = cv;
2251 2339
2252 /* we patch the op, and then re-run the whole call */ 2340 /* we patch the op, and then re-run the whole call */
2253 /* we have to put the same argument on the stack for this to work */ 2341 /* we have to put the same argument on the stack for this to work */
2278 2366
2279 PL_op->op_ppaddr = pp_slf; 2367 PL_op->op_ppaddr = pp_slf;
2280 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2368 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2281 2369
2282 PL_op = (OP *)&slf_restore; 2370 PL_op = (OP *)&slf_restore;
2371}
2372
2373/*****************************************************************************/
2374/* dynamic wind */
2375
2376static void
2377on_enterleave_call (pTHX_ SV *cb)
2378{
2379 dSP;
2380
2381 PUSHSTACK;
2382
2383 PUSHMARK (SP);
2384 PUTBACK;
2385 call_sv (cb, G_VOID | G_DISCARD);
2386 SPAGAIN;
2387
2388 POPSTACK;
2389}
2390
2391static SV *
2392coro_avp_pop_and_free (pTHX_ AV **avp)
2393{
2394 AV *av = *avp;
2395 SV *res = av_pop (av);
2396
2397 if (AvFILLp (av) < 0)
2398 {
2399 *avp = 0;
2400 SvREFCNT_dec (av);
2401 }
2402
2403 return res;
2404}
2405
2406static void
2407coro_pop_on_enter (pTHX_ void *coro)
2408{
2409 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2410 SvREFCNT_dec (cb);
2411}
2412
2413static void
2414coro_pop_on_leave (pTHX_ void *coro)
2415{
2416 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2417 on_enterleave_call (aTHX_ sv_2mortal (cb));
2283} 2418}
2284 2419
2285/*****************************************************************************/ 2420/*****************************************************************************/
2286/* PerlIO::cede */ 2421/* PerlIO::cede */
2287 2422
2361/* Coro::Semaphore & Coro::Signal */ 2496/* Coro::Semaphore & Coro::Signal */
2362 2497
2363static SV * 2498static SV *
2364coro_waitarray_new (pTHX_ int count) 2499coro_waitarray_new (pTHX_ int count)
2365{ 2500{
2366 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2501 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2367 AV *av = newAV (); 2502 AV *av = newAV ();
2368 SV **ary; 2503 SV **ary;
2369 2504
2370 /* unfortunately, building manually saves memory */ 2505 /* unfortunately, building manually saves memory */
2371 Newx (ary, 2, SV *); 2506 Newx (ary, 2, SV *);
2372 AvALLOC (av) = ary; 2507 AvALLOC (av) = ary;
2508#if PERL_VERSION_ATLEAST (5,10,0)
2373 /*AvARRAY (av) = ary;*/ 2509 AvARRAY (av) = ary;
2510#else
2374 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2511 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2512 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2513 SvPVX ((SV *)av) = (char *)ary;
2514#endif
2375 AvMAX (av) = 1; 2515 AvMAX (av) = 1;
2376 AvFILLp (av) = 0; 2516 AvFILLp (av) = 0;
2377 ary [0] = newSViv (count); 2517 ary [0] = newSViv (count);
2378 2518
2379 return newRV_noinc ((SV *)av); 2519 return newRV_noinc ((SV *)av);
2508{ 2648{
2509 if (items >= 2) 2649 if (items >= 2)
2510 { 2650 {
2511 /* callback form */ 2651 /* callback form */
2512 AV *av = (AV *)SvRV (arg [0]); 2652 AV *av = (AV *)SvRV (arg [0]);
2513 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2653 SV *cb_cv = s_get_cv_croak (arg [1]);
2514 2654
2515 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2655 av_push (av, SvREFCNT_inc_NN (cb_cv));
2516 2656
2517 if (SvIVX (AvARRAY (av)[0]) > 0) 2657 if (SvIVX (AvARRAY (av)[0]) > 0)
2518 coro_semaphore_adjust (aTHX_ av, 0); 2658 coro_semaphore_adjust (aTHX_ av, 0);
2519 2659
2520 frame->prepare = prepare_nop; 2660 frame->prepare = prepare_nop;
2544 AvARRAY (av)[0] = AvARRAY (av)[1]; 2684 AvARRAY (av)[0] = AvARRAY (av)[1];
2545 AvARRAY (av)[1] = cb; 2685 AvARRAY (av)[1] = cb;
2546 2686
2547 cb = av_shift (av); 2687 cb = av_shift (av);
2548 2688
2689 if (SvTYPE (cb) == SVt_PVCV)
2690 {
2691 dSP;
2692 PUSHMARK (SP);
2693 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2694 PUTBACK;
2695 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2696 }
2697 else
2698 {
2549 api_ready (aTHX_ cb); 2699 api_ready (aTHX_ cb);
2550 sv_setiv (cb, 0); /* signal waiter */ 2700 sv_setiv (cb, 0); /* signal waiter */
2701 }
2702
2551 SvREFCNT_dec (cb); 2703 SvREFCNT_dec (cb);
2552 2704
2553 --count; 2705 --count;
2554 } 2706 }
2555} 2707}
2564static void 2716static void
2565slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2717slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2566{ 2718{
2567 AV *av = (AV *)SvRV (arg [0]); 2719 AV *av = (AV *)SvRV (arg [0]);
2568 2720
2721 if (items >= 2)
2722 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725
2569 if (SvIVX (AvARRAY (av)[0])) 2726 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2728
2729 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop;
2731 }
2732 else if (SvIVX (AvARRAY (av)[0]))
2570 { 2733 {
2571 SvIVX (AvARRAY (av)[0]) = 0; 2734 SvIVX (AvARRAY (av)[0]) = 0;
2572 frame->prepare = prepare_nop; 2735 frame->prepare = prepare_nop;
2573 frame->check = slf_check_nop; 2736 frame->check = slf_check_nop;
2574 } 2737 }
2575 else 2738 else
2576 { 2739 {
2577 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2740 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2578 2741
2579 av_push (av, waiter); 2742 av_push (av, waiter);
2580 2743
2581 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2744 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2582 frame->prepare = prepare_schedule; 2745 frame->prepare = prepare_schedule;
2600 2763
2601static void 2764static void
2602coro_aio_callback (pTHX_ CV *cv) 2765coro_aio_callback (pTHX_ CV *cv)
2603{ 2766{
2604 dXSARGS; 2767 dXSARGS;
2605 AV *state = (AV *)GENSUB_ARG; 2768 AV *state = (AV *)S_GENSUB_ARG;
2606 SV *coro = av_pop (state); 2769 SV *coro = av_pop (state);
2607 SV *data_sv = newSV (sizeof (struct io_state)); 2770 SV *data_sv = newSV (sizeof (struct io_state));
2608 2771
2609 av_extend (state, items - 1); 2772 av_extend (state, items - 1);
2610 2773
2724 2887
2725 for (i = 0; i < items; ++i) 2888 for (i = 0; i < items; ++i)
2726 PUSHs (arg [i]); 2889 PUSHs (arg [i]);
2727 2890
2728 /* now push the callback closure */ 2891 /* now push the callback closure */
2729 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2892 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2730 2893
2731 /* now call the AIO function - we assume our request is uncancelable */ 2894 /* now call the AIO function - we assume our request is uncancelable */
2732 PUTBACK; 2895 PUTBACK;
2733 call_sv ((SV *)req, G_VOID | G_DISCARD); 2896 call_sv ((SV *)req, G_VOID | G_DISCARD);
2734 } 2897 }
2752/*****************************************************************************/ 2915/*****************************************************************************/
2753 2916
2754#if CORO_CLONE 2917#if CORO_CLONE
2755# include "clone.c" 2918# include "clone.c"
2756#endif 2919#endif
2920
2921/*****************************************************************************/
2922
2923static SV *
2924coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2925{
2926 SV *coro_sv;
2927 struct coro *coro;
2928 MAGIC *mg;
2929 HV *hv;
2930 SV *cb;
2931 int i;
2932
2933 if (argc > 0)
2934 {
2935 cb = s_get_cv_croak (argv [0]);
2936
2937 if (!is_coro)
2938 {
2939 if (CvISXSUB (cb))
2940 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2941
2942 if (!CvROOT (cb))
2943 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2944 }
2945 }
2946
2947 Newz (0, coro, 1, struct coro);
2948 coro->args = newAV ();
2949 coro->flags = CF_NEW;
2950
2951 if (coro_first) coro_first->prev = coro;
2952 coro->next = coro_first;
2953 coro_first = coro;
2954
2955 coro->hv = hv = newHV ();
2956 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2957 mg->mg_flags |= MGf_DUP;
2958 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2959
2960 if (argc > 0)
2961 {
2962 av_extend (coro->args, argc + is_coro - 1);
2963
2964 if (is_coro)
2965 {
2966 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2967 cb = (SV *)cv_coro_run;
2968 }
2969
2970 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2971
2972 for (i = 1; i < argc; i++)
2973 av_push (coro->args, newSVsv (argv [i]));
2974 }
2975
2976 return coro_sv;
2977}
2757 2978
2758MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2979MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2759 2980
2760PROTOTYPES: DISABLE 2981PROTOTYPES: DISABLE
2761 2982
2821 3042
2822 if (!svp) croak ("Time::HiRes is required"); 3043 if (!svp) croak ("Time::HiRes is required");
2823 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2824 3045
2825 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2826 } 3050 }
2827 3051
2828 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2829} 3053}
2830 3054
2831SV * 3055SV *
2832new (char *klass, ...) 3056new (SV *klass, ...)
2833 ALIAS: 3057 ALIAS:
2834 Coro::new = 1 3058 Coro::new = 1
2835 CODE: 3059 CODE:
2836{ 3060 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2837 struct coro *coro; 3061 OUTPUT:
2838 MAGIC *mg;
2839 HV *hv;
2840 CV *cb;
2841 int i;
2842
2843 if (items > 1)
2844 {
2845 cb = coro_sv_2cv (aTHX_ ST (1));
2846
2847 if (!ix)
2848 {
2849 if (CvISXSUB (cb))
2850 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2851
2852 if (!CvROOT (cb))
2853 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2854 }
2855 }
2856
2857 Newz (0, coro, 1, struct coro);
2858 coro->args = newAV ();
2859 coro->flags = CF_NEW;
2860
2861 if (coro_first) coro_first->prev = coro;
2862 coro->next = coro_first;
2863 coro_first = coro;
2864
2865 coro->hv = hv = newHV ();
2866 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2867 mg->mg_flags |= MGf_DUP;
2868 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2869
2870 if (items > 1)
2871 {
2872 av_extend (coro->args, items - 1 + ix - 1);
2873
2874 if (ix)
2875 {
2876 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2877 cb = cv_coro_run;
2878 }
2879
2880 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2881
2882 for (i = 2; i < items; i++)
2883 av_push (coro->args, newSVsv (ST (i)));
2884 }
2885}
2886 OUTPUT:
2887 RETVAL 3062 RETVAL
2888 3063
2889void 3064void
2890transfer (...) 3065transfer (...)
2891 PROTOTYPE: $$ 3066 PROTOTYPE: $$
2908SV * 3083SV *
2909clone (Coro::State coro) 3084clone (Coro::State coro)
2910 CODE: 3085 CODE:
2911{ 3086{
2912#if CORO_CLONE 3087#if CORO_CLONE
2913 struct coro *ncoro = coro_clone (coro); 3088 struct coro *ncoro = coro_clone (aTHX_ coro);
2914 MAGIC *mg; 3089 MAGIC *mg;
2915 /* TODO: too much duplication */ 3090 /* TODO: too much duplication */
2916 ncoro->hv = newHV (); 3091 ncoro->hv = newHV ();
2917 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3092 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2918 mg->mg_flags |= MGf_DUP; 3093 mg->mg_flags |= MGf_DUP;
2980 eval = 1 3155 eval = 1
2981 CODE: 3156 CODE:
2982{ 3157{
2983 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3158 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2984 { 3159 {
2985 struct coro temp; 3160 struct coro *current = SvSTATE_current;
2986 3161
2987 if (!(coro->flags & CF_RUNNING)) 3162 if (current != coro)
2988 { 3163 {
2989 PUTBACK; 3164 PUTBACK;
2990 save_perl (aTHX_ &temp); 3165 save_perl (aTHX_ current);
2991 load_perl (aTHX_ coro); 3166 load_perl (aTHX_ coro);
3167 SPAGAIN;
2992 } 3168 }
2993 3169
2994 {
2995 dSP;
2996 ENTER;
2997 SAVETMPS;
2998 PUTBACK;
2999 PUSHSTACK; 3170 PUSHSTACK;
3171
3000 PUSHMARK (SP); 3172 PUSHMARK (SP);
3173 PUTBACK;
3001 3174
3002 if (ix) 3175 if (ix)
3003 eval_sv (coderef, 0); 3176 eval_sv (coderef, 0);
3004 else 3177 else
3005 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3178 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3006 3179
3007 POPSTACK; 3180 POPSTACK;
3008 SPAGAIN; 3181 SPAGAIN;
3009 FREETMPS;
3010 LEAVE;
3011 PUTBACK;
3012 }
3013 3182
3014 if (!(coro->flags & CF_RUNNING)) 3183 if (current != coro)
3015 { 3184 {
3185 PUTBACK;
3016 save_perl (aTHX_ coro); 3186 save_perl (aTHX_ coro);
3017 load_perl (aTHX_ &temp); 3187 load_perl (aTHX_ current);
3018 SPAGAIN; 3188 SPAGAIN;
3019 } 3189 }
3020 } 3190 }
3021} 3191}
3022 3192
3026 ALIAS: 3196 ALIAS:
3027 is_ready = CF_READY 3197 is_ready = CF_READY
3028 is_running = CF_RUNNING 3198 is_running = CF_RUNNING
3029 is_new = CF_NEW 3199 is_new = CF_NEW
3030 is_destroyed = CF_DESTROYED 3200 is_destroyed = CF_DESTROYED
3201 is_suspended = CF_SUSPENDED
3031 CODE: 3202 CODE:
3032 RETVAL = boolSV (coro->flags & ix); 3203 RETVAL = boolSV (coro->flags & ix);
3033 OUTPUT: 3204 OUTPUT:
3034 RETVAL 3205 RETVAL
3035 3206
3039 CODE: 3210 CODE:
3040{ 3211{
3041 struct coro *current = SvSTATE_current; 3212 struct coro *current = SvSTATE_current;
3042 SV **throwp = self == current ? &CORO_THROW : &self->except; 3213 SV **throwp = self == current ? &CORO_THROW : &self->except;
3043 SvREFCNT_dec (*throwp); 3214 SvREFCNT_dec (*throwp);
3215 SvGETMAGIC (throw);
3044 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3045} 3217}
3046 3218
3047void 3219void
3048api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3100 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3272 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3101 3273
3102 SV *tmp = *src; *src = *dst; *dst = tmp; 3274 SV *tmp = *src; *src = *dst; *dst = tmp;
3103 } 3275 }
3104 3276
3277void
3278cancel (Coro::State self)
3279 CODE:
3280 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283
3284SV *
3285enable_times (int enabled = enable_times)
3286 CODE:
3287{
3288 RETVAL = boolSV (enable_times);
3289
3290 if (enabled != enable_times)
3291 {
3292 enable_times = enabled;
3293
3294 coro_times_update ();
3295 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3296 }
3297}
3298 OUTPUT:
3299 RETVAL
3300
3301void
3302times (Coro::State self)
3303 PPCODE:
3304{
3305 struct coro *current = SvSTATE (coro_current);
3306
3307 if (expect_false (current == self))
3308 {
3309 coro_times_update ();
3310 coro_times_add (SvSTATE (coro_current));
3311 }
3312
3313 EXTEND (SP, 2);
3314 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316
3317 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current));
3319}
3105 3320
3106MODULE = Coro::State PACKAGE = Coro 3321MODULE = Coro::State PACKAGE = Coro
3107 3322
3108BOOT: 3323BOOT:
3109{ 3324{
3110 int i;
3111
3112 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3325 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3113 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3326 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3114 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3327 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3115 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3328 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3116 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3329 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3117 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3330 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3118 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3331 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3119 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3332 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3120 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3333 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3121 3334
3122 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3335 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3123 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3336 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3124 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3337 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3125 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3338 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3126 3339
3127 coro_stash = gv_stashpv ("Coro", TRUE); 3340 coro_stash = gv_stashpv ("Coro", TRUE);
3128 3341
3129 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3342 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3130 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3343 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3131 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3344 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3132 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3345 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3133 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3346 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3134 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3347 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3135
3136 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3137 coro_ready[i] = newAV ();
3138 3348
3139 { 3349 {
3140 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3350 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3141 3351
3142 coroapi.schedule = api_schedule; 3352 coroapi.schedule = api_schedule;
3152 sv_setiv (sv, (IV)&coroapi); 3362 sv_setiv (sv, (IV)&coroapi);
3153 SvREADONLY_on (sv); 3363 SvREADONLY_on (sv);
3154 } 3364 }
3155} 3365}
3156 3366
3367SV *
3368async (...)
3369 PROTOTYPE: &@
3370 CODE:
3371 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3372 api_ready (aTHX_ RETVAL);
3373 OUTPUT:
3374 RETVAL
3375
3157void 3376void
3158terminate (...) 3377terminate (...)
3159 CODE: 3378 CODE:
3160 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3379 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3161 3380
3181 3400
3182void 3401void
3183cede_notself (...) 3402cede_notself (...)
3184 CODE: 3403 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3404 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3186
3187void
3188_cancel (Coro::State self)
3189 CODE:
3190 coro_state_destroy (aTHX_ self);
3191 coro_call_on_destroy (aTHX_ self);
3192 3405
3193void 3406void
3194_set_current (SV *current) 3407_set_current (SV *current)
3195 PROTOTYPE: $ 3408 PROTOTYPE: $
3196 CODE: 3409 CODE:
3200void 3413void
3201_set_readyhook (SV *hook) 3414_set_readyhook (SV *hook)
3202 PROTOTYPE: $ 3415 PROTOTYPE: $
3203 CODE: 3416 CODE:
3204 SvREFCNT_dec (coro_readyhook); 3417 SvREFCNT_dec (coro_readyhook);
3418 SvGETMAGIC (hook);
3419 if (SvOK (hook))
3420 {
3205 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3421 coro_readyhook = newSVsv (hook);
3422 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3423 }
3424 else
3425 {
3426 coro_readyhook = 0;
3427 CORO_READYHOOK = 0;
3428 }
3206 3429
3207int 3430int
3208prio (Coro::State coro, int newprio = 0) 3431prio (Coro::State coro, int newprio = 0)
3209 PROTOTYPE: $;$ 3432 PROTOTYPE: $;$
3210 ALIAS: 3433 ALIAS:
3216 if (items > 1) 3439 if (items > 1)
3217 { 3440 {
3218 if (ix) 3441 if (ix)
3219 newprio = coro->prio - newprio; 3442 newprio = coro->prio - newprio;
3220 3443
3221 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3444 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3222 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3445 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3223 3446
3224 coro->prio = newprio; 3447 coro->prio = newprio;
3225 } 3448 }
3226} 3449}
3227 OUTPUT: 3450 OUTPUT:
3242 RETVAL = coro_nready; 3465 RETVAL = coro_nready;
3243 OUTPUT: 3466 OUTPUT:
3244 RETVAL 3467 RETVAL
3245 3468
3246void 3469void
3470suspend (Coro::State self)
3471 PROTOTYPE: $
3472 CODE:
3473 self->flags |= CF_SUSPENDED;
3474
3475void
3476resume (Coro::State self)
3477 PROTOTYPE: $
3478 CODE:
3479 self->flags &= ~CF_SUSPENDED;
3480
3481void
3247_pool_handler (...) 3482_pool_handler (...)
3248 CODE: 3483 CODE:
3249 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3484 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3250 3485
3251void 3486void
3262 for (i = 1; i < items; ++i) 3497 for (i = 1; i < items; ++i)
3263 av_push (av, SvREFCNT_inc_NN (ST (i))); 3498 av_push (av, SvREFCNT_inc_NN (ST (i)));
3264 3499
3265 if ((SV *)hv == &PL_sv_undef) 3500 if ((SV *)hv == &PL_sv_undef)
3266 { 3501 {
3267 PUSHMARK (SP); 3502 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3268 EXTEND (SP, 2);
3269 PUSHs (sv_Coro);
3270 PUSHs ((SV *)cv_pool_handler);
3271 PUTBACK;
3272 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3273 SPAGAIN;
3274
3275 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3503 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3504 SvREFCNT_dec (sv);
3276 } 3505 }
3277 3506
3278 { 3507 {
3279 struct coro *coro = SvSTATE_hv (hv); 3508 struct coro *coro = SvSTATE_hv (hv);
3280 3509
3304rouse_wait (...) 3533rouse_wait (...)
3305 PROTOTYPE: ;$ 3534 PROTOTYPE: ;$
3306 PPCODE: 3535 PPCODE:
3307 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3536 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3308 3537
3538void
3539on_enter (SV *block)
3540 ALIAS:
3541 on_leave = 1
3542 PROTOTYPE: &
3543 CODE:
3544{
3545 struct coro *coro = SvSTATE_current;
3546 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3547
3548 block = s_get_cv_croak (block);
3549
3550 if (!*avp)
3551 *avp = newAV ();
3552
3553 av_push (*avp, SvREFCNT_inc (block));
3554
3555 if (!ix)
3556 on_enterleave_call (aTHX_ block);
3557
3558 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3559 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3560 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3561}
3562
3309 3563
3310MODULE = Coro::State PACKAGE = PerlIO::cede 3564MODULE = Coro::State PACKAGE = PerlIO::cede
3311 3565
3312BOOT: 3566BOOT:
3313 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3567 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3316MODULE = Coro::State PACKAGE = Coro::Semaphore 3570MODULE = Coro::State PACKAGE = Coro::Semaphore
3317 3571
3318SV * 3572SV *
3319new (SV *klass, SV *count = 0) 3573new (SV *klass, SV *count = 0)
3320 CODE: 3574 CODE:
3575{
3576 int semcnt = 1;
3577
3578 if (count)
3579 {
3580 SvGETMAGIC (count);
3581
3582 if (SvOK (count))
3583 semcnt = SvIV (count);
3584 }
3585
3321 RETVAL = sv_bless ( 3586 RETVAL = sv_bless (
3322 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3587 coro_waitarray_new (aTHX_ semcnt),
3323 GvSTASH (CvGV (cv)) 3588 GvSTASH (CvGV (cv))
3324 ); 3589 );
3590}
3325 OUTPUT: 3591 OUTPUT:
3326 RETVAL 3592 RETVAL
3327 3593
3328# helper for Coro::Channel 3594# helper for Coro::Channel and others
3329SV * 3595SV *
3330_alloc (int count) 3596_alloc (int count)
3331 CODE: 3597 CODE:
3332 RETVAL = coro_waitarray_new (aTHX_ count); 3598 RETVAL = coro_waitarray_new (aTHX_ count);
3333 OUTPUT: 3599 OUTPUT:
3391 for (i = 1; i <= wcount; ++i) 3657 for (i = 1; i <= wcount; ++i)
3392 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3658 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3393 } 3659 }
3394} 3660}
3395 3661
3662MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3663
3664void
3665_may_delete (SV *sem, int count, int extra_refs)
3666 PPCODE:
3667{
3668 AV *av = (AV *)SvRV (sem);
3669
3670 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3671 && AvFILLp (av) == 0 /* no waiters, just count */
3672 && SvIV (AvARRAY (av)[0]) == count)
3673 XSRETURN_YES;
3674
3675 XSRETURN_NO;
3676}
3677
3396MODULE = Coro::State PACKAGE = Coro::Signal 3678MODULE = Coro::State PACKAGE = Coro::Signal
3397 3679
3398SV * 3680SV *
3399new (SV *klass) 3681new (SV *klass)
3400 CODE: 3682 CODE:
3471 3753
3472void 3754void
3473_register (char *target, char *proto, SV *req) 3755_register (char *target, char *proto, SV *req)
3474 CODE: 3756 CODE:
3475{ 3757{
3476 CV *req_cv = coro_sv_2cv (aTHX_ req); 3758 SV *req_cv = s_get_cv_croak (req);
3477 /* newXSproto doesn't return the CV on 5.8 */ 3759 /* newXSproto doesn't return the CV on 5.8 */
3478 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3760 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3479 sv_setpv ((SV *)slf_cv, proto); 3761 sv_setpv ((SV *)slf_cv, proto);
3480 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3762 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3481} 3763}
3482 3764
3765MODULE = Coro::State PACKAGE = Coro::Select
3766
3767void
3768patch_pp_sselect ()
3769 CODE:
3770 if (!coro_old_pp_sselect)
3771 {
3772 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3773 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3774 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3775 }
3776
3777void
3778unpatch_pp_sselect ()
3779 CODE:
3780 if (coro_old_pp_sselect)
3781 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0;
3784 }
3785
3786

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines