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.326 by root, Mon Nov 24 04:56:38 2008 UTC vs.
Revision 1.373 by root, Thu Oct 1 23:51:33 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{
248 SV *defsv; 206 SV *defsv;
249 AV *defav; 207 AV *defav;
250 SV *errsv; 208 SV *errsv;
251 SV *irsgv; 209 SV *irsgv;
210 HV *hinthv;
252#define VAR(name,type) type name; 211#define VAR(name,type) type name;
253# include "state.h" 212# include "state.h"
254#undef VAR 213#undef VAR
255} perl_slots; 214} perl_slots;
256 215
258 217
259/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
260struct coro { 219struct coro {
261 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
262 coro_cctx *cctx; 221 coro_cctx *cctx;
222
223 /* ready queue */
224 struct coro *next_ready;
263 225
264 /* state data */ 226 /* state data */
265 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
266 AV *mainstack; 228 AV *mainstack;
267 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
284 /* async_pool */ 246 /* async_pool */
285 SV *saved_deffh; 247 SV *saved_deffh;
286 SV *invoke_cb; 248 SV *invoke_cb;
287 AV *invoke_av; 249 AV *invoke_av;
288 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
289 /* linked list */ 258 /* linked list */
290 struct coro *next, *prev; 259 struct coro *next, *prev;
291}; 260};
292 261
293typedef struct coro *Coro__State; 262typedef struct coro *Coro__State;
298/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
299static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
300 269
301/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
302 271
303#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
304#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
305#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
306#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
307#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
308#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
309 278
310/* for Coro.pm */ 279/* for Coro.pm */
311static SV *coro_current; 280static SV *coro_current;
312static SV *coro_readyhook; 281static SV *coro_readyhook;
313static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
314static CV *cv_coro_run, *cv_coro_terminate; 283static CV *cv_coro_run, *cv_coro_terminate;
315static struct coro *coro_first; 284static struct coro *coro_first;
316#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}
317 306
318/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
319 308
320static SV * 309static SV *
321coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
345 get_hv (name, create); 334 get_hv (name, create);
346#endif 335#endif
347 return get_hv (name, create); 336 return get_hv (name, create);
348} 337}
349 338
350/* may croak */ 339INLINE void
351INLINE CV * 340coro_times_update ()
352coro_sv_2cv (pTHX_ SV *sv)
353{ 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{
354 HV *st; 408 HV *stash;
355 GV *gvp; 409 MAGIC *mg;
356 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;
357} 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 */
358 437
359static AV * 438static AV *
360coro_derive_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
361{ 440{
362 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
370 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
371#endif 450#endif
372 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
373 --AvFILLp (padlist); 452 --AvFILLp (padlist);
374 453
375 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
376 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
377 456
378 return newpadlist; 457 return newpadlist;
379} 458}
380 459
381static void 460static void
382free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
383{ 462{
384 /* may be during global destruction */ 463 /* may be during global destruction */
385 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
386 { 465 {
387 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
388 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
389 { 469 {
390 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
391 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
392 { 472 I32 j = AvFILLp (av);
393 SV *sv; 473
394 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
395 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
396
397 SvREFCNT_dec (*svp);
398 }
399 } 479 }
400 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
401 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
402 } 485 }
403} 486}
404 487
405static int 488static int
406coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
407{ 490{
408 AV *padlist; 491 AV *padlist;
409 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;
410 497
411 /* casting is fun. */ 498 /* casting is fun. */
412 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
413 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
414 501
415 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
416 503
417 return 0; 504 return 0;
418} 505}
419
420#define CORO_MAGIC_type_cv 26
421#define CORO_MAGIC_type_state PERL_MAGIC_ext
422 506
423static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
424 0, 0, 0, 0, 508 0, 0, 0, 0,
425 coro_cv_free 509 coro_cv_free
426}; 510};
427
428#define CORO_MAGIC_NN(sv, type) \
429 (expect_true (SvMAGIC (sv)->mg_type == type) \
430 ? SvMAGIC (sv) \
431 : mg_find (sv, type))
432
433#define CORO_MAGIC(sv, type) \
434 (expect_true (SvMAGIC (sv)) \
435 ? CORO_MAGIC_NN (sv, type) \
436 : 0)
437
438#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
439#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
440
441INLINE struct coro *
442SvSTATE_ (pTHX_ SV *coro)
443{
444 HV *stash;
445 MAGIC *mg;
446
447 if (SvROK (coro))
448 coro = SvRV (coro);
449
450 if (expect_false (SvTYPE (coro) != SVt_PVHV))
451 croak ("Coro::State object required");
452
453 stash = SvSTASH (coro);
454 if (expect_false (stash != coro_stash && stash != coro_state_stash))
455 {
456 /* very slow, but rare, check */
457 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
458 croak ("Coro::State object required");
459 }
460
461 mg = CORO_MAGIC_state (coro);
462 return (struct coro *)mg->mg_ptr;
463}
464
465#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
466
467/* faster than SvSTATE, but expects a coroutine hv */
468#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
469#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
470 511
471/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
472static void 513static void
473get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
474{ 515{
502 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);
503 544
504 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
505 546
506 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
507 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
508 549
509 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
510} 551}
511 552
512/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
513 557
514static void 558static void
515load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
516{ 560{
517 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
518 c->slot = 0; 562 c->slot = 0;
519 563
520 PL_mainstack = c->mainstack; 564 PL_mainstack = c->mainstack;
521 565
522 GvSV (PL_defgv) = slot->defsv; 566 GvSV (PL_defgv) = slot->defsv;
523 GvAV (PL_defgv) = slot->defav; 567 GvAV (PL_defgv) = slot->defav;
524 GvSV (PL_errgv) = slot->errsv; 568 GvSV (PL_errgv) = slot->errsv;
525 GvSV (irsgv) = slot->irsgv; 569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
526 571
527 #define VAR(name,type) PL_ ## name = slot->name; 572 #define VAR(name,type) PL_ ## name = slot->name;
528 # include "state.h" 573 # include "state.h"
529 #undef VAR 574 #undef VAR
530 575
544 PUTBACK; 589 PUTBACK;
545 } 590 }
546 591
547 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
548 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 }
549} 610}
550 611
551static void 612static void
552save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
553{ 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
554 c->except = CORO_THROW; 631 c->except = CORO_THROW;
555 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
556 633
557 { 634 {
558 dSP; 635 dSP;
571 { 648 {
572 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
573 { 650 {
574 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
575 652
576 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))
577 { 654 {
578 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
579 656
580 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
581 { 658 {
605 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
606 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
607 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
608 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
609 { 686 {
610 int i; 687 unsigned int i;
611 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
612 CXINC; 689 CXINC;
613 } 690 }
614 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
615 692
616 c->mainstack = PL_mainstack; 693 c->mainstack = PL_mainstack;
617 694
618 { 695 {
619 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
620 697
621 slot->defav = GvAV (PL_defgv); 698 slot->defav = GvAV (PL_defgv);
622 slot->defsv = DEFSV; 699 slot->defsv = DEFSV;
623 slot->errsv = ERRSV; 700 slot->errsv = ERRSV;
624 slot->irsgv = GvSV (irsgv); 701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
625 703
626 #define VAR(name,type) slot->name = PL_ ## name; 704 #define VAR(name,type) slot->name = PL_ ## name;
627 # include "state.h" 705 # include "state.h"
628 #undef VAR 706 #undef VAR
629 } 707 }
756#endif 834#endif
757 835
758/* 836/*
759 * This overrides the default magic get method of %SIG elements. 837 * This overrides the default magic get method of %SIG elements.
760 * 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
761 * 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
762 * readback here. 840 * readback here.
763 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
764 * not expecting this to actually change the hook. This is a potential problem
765 * when a schedule happens then, but we ignore this.
766 */ 841 */
767static int 842static int
768coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
769{ 844{
770 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
823 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
824 899
825 if (svp) 900 if (svp)
826 { 901 {
827 SV *old = *svp; 902 SV *old = *svp;
828 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
829 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
830 return 0; 905 return 0;
831 } 906 }
832 } 907 }
833 908
865 940
866 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
867 PL_curcop = &PL_compiling; 942 PL_curcop = &PL_compiling;
868 PL_in_eval = EVAL_NULL; 943 PL_in_eval = EVAL_NULL;
869 PL_comppad = 0; 944 PL_comppad = 0;
945 PL_comppad_name = 0;
946 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0;
870 PL_curpm = 0; 948 PL_curpm = 0;
871 PL_curpad = 0; 949 PL_curpad = 0;
872 PL_localizing = 0; 950 PL_localizing = 0;
873 PL_dirty = 0; 951 PL_dirty = 0;
874 PL_restartop = 0; 952 PL_restartop = 0;
875#if PERL_VERSION_ATLEAST (5,10,0) 953#if PERL_VERSION_ATLEAST (5,10,0)
876 PL_parser = 0; 954 PL_parser = 0;
877#endif 955#endif
956 PL_hints = 0;
878 957
879 /* recreate the die/warn hooks */ 958 /* recreate the die/warn hooks */
880 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
881 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
882 961
883 GvSV (PL_defgv) = newSV (0); 962 GvSV (PL_defgv) = newSV (0);
884 GvAV (PL_defgv) = coro->args; coro->args = 0; 963 GvAV (PL_defgv) = coro->args; coro->args = 0;
885 GvSV (PL_errgv) = newSV (0); 964 GvSV (PL_errgv) = newSV (0);
886 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0;
887 PL_rs = newSVsv (GvSV (irsgv)); 967 PL_rs = newSVsv (GvSV (irsgv));
888 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
889 969
890 { 970 {
891 dSP; 971 dSP;
917 997
918 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
919 999
920 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
921 CORO_THROW = coro->except; 1001 CORO_THROW = coro->except;
922}
923 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
924static void 1010static void
925coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
926{ 1012{
927 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
928 { 1014 {
929 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
930 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
938 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
939 1025
940 /* unwind main stack */ 1026 /* unwind main stack */
941 dounwind (-1); 1027 dounwind (-1);
942 } 1028 }
1029}
943 1030
944 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
945 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
946 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
947 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
948 SvREFCNT_dec (PL_rs);
949 SvREFCNT_dec (GvSV (irsgv));
950 1035
951 SvREFCNT_dec (PL_diehook);
952 SvREFCNT_dec (PL_warnhook);
953 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
954 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
955 SvREFCNT_dec (coro->rouse_cb); 1069 SvREFCNT_dec (coro->rouse_cb);
956 SvREFCNT_dec (coro->invoke_cb); 1070 SvREFCNT_dec (coro->invoke_cb);
957 SvREFCNT_dec (coro->invoke_av); 1071 SvREFCNT_dec (coro->invoke_av);
958 1072 }
959 coro_destruct_stacks (aTHX);
960} 1073}
961 1074
962INLINE void 1075INLINE void
963free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
964{ 1077{
1161 /* 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 */
1162 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1163 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1164 /* 1277 /*
1165 * 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
1166 * 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.
1167 */ 1281 */
1168 1282
1169 /* 1283 /*
1170 * 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
1171 * 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)
1172 * 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
1173 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1174 * 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.
1175 */ 1291 */
1176 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1177 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 */
1178 } 1294 }
1179} 1295}
1256cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1257{ 1373{
1258 if (!cctx) 1374 if (!cctx)
1259 return; 1375 return;
1260 1376
1261 assert (cctx != cctx_current);//D temporary 1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1262 1378
1263 --cctx_count; 1379 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1265 1381
1266 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1330 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1331 1447
1332 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1333 { 1449 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1335 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,");
1336 1452
1337 if (expect_false (next->flags & CF_RUNNING))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1341 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,");
1342 1455
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1345 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,");
1346#endif 1459#endif
1384 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1385 } 1498 }
1386 else 1499 else
1387 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1388 1501
1389 assert (!prev->cctx);//D temporary
1390
1391 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1392 if (expect_true ( 1503 if (expect_true (
1393 cctx_current->idle_sp == STACKLEVEL 1504 cctx_current->idle_sp == STACKLEVEL
1394 && !(cctx_current->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1395 && !force_cctx 1506 && !force_cctx
1436coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1437{ 1548{
1438 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1439 return 0; 1550 return 0;
1440 1551
1441 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1442 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1443 1554
1444 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1445 1556
1446 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
1450 --coro_nready; 1561 --coro_nready;
1451 } 1562 }
1452 else 1563 else
1453 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 */
1454 1565
1455 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1456 { 1567 && coro->mainstack != main_mainstack
1457 struct coro temp; 1568 && coro->slot
1458 1569 && !PL_dirty)
1459 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1460
1461 save_perl (aTHX_ &temp);
1462 load_perl (aTHX_ coro);
1463
1464 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1465
1466 load_perl (aTHX_ &temp);
1467
1468 coro->slot = 0;
1469 }
1470 1571
1471 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv); 1573 SvREFCNT_dec (coro->startcv);
1473 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1474 SvREFCNT_dec (CORO_THROW); 1575 SvREFCNT_dec (CORO_THROW);
1533 1634
1534 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1635 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1535 TRANSFER (ta, 1); 1636 TRANSFER (ta, 1);
1536} 1637}
1537 1638
1538/*****************************************************************************/
1539/* gensub: simple closure generation utility */
1540
1541#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1542
1543/* create a closure from XS, returns a code reference */
1544/* the arg can be accessed via GENSUB_ARG from the callback */
1545/* the callback must use dXSARGS/XSRETURN */
1546static SV *
1547gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1548{
1549 CV *cv = (CV *)newSV (0);
1550
1551 sv_upgrade ((SV *)cv, SVt_PVCV);
1552
1553 CvANON_on (cv);
1554 CvISXSUB_on (cv);
1555 CvXSUB (cv) = xsub;
1556 GENSUB_ARG = arg;
1557
1558 return newRV_noinc ((SV *)cv);
1559}
1560
1561/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1562 1640
1563INLINE void 1641INLINE void
1564coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1565{ 1643{
1566 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1567}
1568 1645
1569INLINE 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 *
1570coro_deq (pTHX) 1654coro_deq (pTHX)
1571{ 1655{
1572 int prio; 1656 int prio;
1573 1657
1574 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1575 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1576 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 }
1577 1669
1578 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;
1579} 1688}
1580 1689
1581static int 1690static int
1582api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1583{ 1692{
1584 struct coro *coro;
1585 SV *sv_hook;
1586 void (*xs_hook)(void);
1587
1588 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1589 1694
1590 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1591 return 0; 1696 return 0;
1592 1697
1593 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1594 1699
1595 sv_hook = coro_nready ? 0 : coro_readyhook;
1596 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1597
1598 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1599 ++coro_nready;
1600 1701
1601 if (sv_hook) 1702 if (!coro_nready++)
1602 { 1703 if (coroapi.readyhook)
1603 dSP; 1704 coroapi.readyhook ();
1604
1605 ENTER;
1606 SAVETMPS;
1607
1608 PUSHMARK (SP);
1609 PUTBACK;
1610 call_sv (sv_hook, G_VOID | G_DISCARD);
1611
1612 FREETMPS;
1613 LEAVE;
1614 }
1615
1616 if (xs_hook)
1617 xs_hook ();
1618 1705
1619 return 1; 1706 return 1;
1620} 1707}
1621 1708
1622static int 1709static int
1645static void 1732static void
1646prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1647{ 1734{
1648 for (;;) 1735 for (;;)
1649 { 1736 {
1650 SV *next_sv = coro_deq (aTHX); 1737 struct coro *next = coro_deq (aTHX);
1651 1738
1652 if (expect_true (next_sv)) 1739 if (expect_true (next))
1653 { 1740 {
1654 struct coro *next = SvSTATE_hv (next_sv);
1655
1656 /* cannot transfer to destroyed coros, skip and look for next */ 1741 /* cannot transfer to destroyed coros, skip and look for next */
1657 if (expect_false (next->flags & CF_DESTROYED)) 1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1658 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 */
1659 else 1744 else
1660 { 1745 {
1661 next->flags &= ~CF_READY; 1746 next->flags &= ~CF_READY;
1662 --coro_nready; 1747 --coro_nready;
1663 1748
1670 /* nothing to schedule: call the idle handler */ 1755 /* nothing to schedule: call the idle handler */
1671 if (SvROK (sv_idle) 1756 if (SvROK (sv_idle)
1672 && SvOBJECT (SvRV (sv_idle))) 1757 && SvOBJECT (SvRV (sv_idle)))
1673 { 1758 {
1674 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1675 api_ready (SvRV (sv_idle)); 1760 api_ready (aTHX_ SvRV (sv_idle));
1676 --coro_nready; 1761 --coro_nready;
1677 } 1762 }
1678 else 1763 else
1679 { 1764 {
1765 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1680 dSP; 1766 dSP;
1681 1767
1682 ENTER; 1768 ENTER;
1683 SAVETMPS; 1769 SAVETMPS;
1684 1770
1830{ 1916{
1831 int i; 1917 int i;
1832 HV *hv = (HV *)SvRV (coro_current); 1918 HV *hv = (HV *)SvRV (coro_current);
1833 AV *av = newAV (); 1919 AV *av = newAV ();
1834 1920
1921 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1835 av_extend (av, items - 1); 1924 av_extend (av, items - 1);
1925
1836 for (i = 0; i < items; ++i) 1926 for (i = 0; i < items; ++i)
1837 av_push (av, SvREFCNT_inc_NN (arg [i])); 1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1838 1929
1839 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);
1840 1931
1841 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 */
1842 api_ready (aTHX_ sv_manager); 1933 api_ready (aTHX_ sv_manager);
1843 1934
1844 frame->prepare = prepare_schedule; 1935 frame->prepare = prepare_schedule;
1845 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);*/
1846} 1941}
1847 1942
1848/*****************************************************************************/ 1943/*****************************************************************************/
1849/* async pool handler */ 1944/* async pool handler */
1850 1945
1928 2023
1929static void 2024static void
1930coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1931{ 2026{
1932 dXSARGS; 2027 dXSARGS;
1933 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1934 2029
1935 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1936 { 2031 {
1937 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data);
1938 AV *av = newAV (); 2034 AV *av = newAV ();
1939 SV *coro = SvRV (data);
1940 2035
1941 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1942 api_ready (aTHX_ coro);
1943 SvREFCNT_dec (coro);
1944 2037
1945 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
1946 while (items--) 2039 while (items--)
1947 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);
1948 } 2044 }
1949 2045
1950 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
1951} 2047}
1952 2048
1969 2065
1970 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
1971 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
1972 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1973 2069
1974 /* 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 */
1975 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
1976 av_undef (av); 2072 av_undef (av);
1977 2073
1978 PUTBACK; 2074 PUTBACK;
1979 } 2075 }
2003 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
2004 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2005 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
2006 2102
2007 { 2103 {
2008 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2009 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
2010 2106
2011 frame->data = (void *)data; 2107 frame->data = (void *)data;
2012 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2013 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
2014 } 2110 }
2018coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
2019{ 2115{
2020 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
2021 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
2022 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
2023 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2024 2120
2025 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);
2026 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
2027 2123
2028 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
2269 2365
2270 PL_op->op_ppaddr = pp_slf; 2366 PL_op->op_ppaddr = pp_slf;
2271 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2367 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2272 2368
2273 PL_op = (OP *)&slf_restore; 2369 PL_op = (OP *)&slf_restore;
2370}
2371
2372/*****************************************************************************/
2373/* dynamic wind */
2374
2375static void
2376on_enterleave_call (pTHX_ SV *cb)
2377{
2378 dSP;
2379
2380 PUSHSTACK;
2381
2382 PUSHMARK (SP);
2383 PUTBACK;
2384 call_sv (cb, G_VOID | G_DISCARD);
2385 SPAGAIN;
2386
2387 POPSTACK;
2388}
2389
2390static SV *
2391coro_avp_pop_and_free (pTHX_ AV **avp)
2392{
2393 AV *av = *avp;
2394 SV *res = av_pop (av);
2395
2396 if (AvFILLp (av) < 0)
2397 {
2398 *avp = 0;
2399 SvREFCNT_dec (av);
2400 }
2401
2402 return res;
2403}
2404
2405static void
2406coro_pop_on_enter (pTHX_ void *coro)
2407{
2408 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2409 SvREFCNT_dec (cb);
2410}
2411
2412static void
2413coro_pop_on_leave (pTHX_ void *coro)
2414{
2415 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2416 on_enterleave_call (aTHX_ sv_2mortal (cb));
2274} 2417}
2275 2418
2276/*****************************************************************************/ 2419/*****************************************************************************/
2277/* PerlIO::cede */ 2420/* PerlIO::cede */
2278 2421
2352/* Coro::Semaphore & Coro::Signal */ 2495/* Coro::Semaphore & Coro::Signal */
2353 2496
2354static SV * 2497static SV *
2355coro_waitarray_new (pTHX_ int count) 2498coro_waitarray_new (pTHX_ int count)
2356{ 2499{
2357 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2500 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2358 AV *av = newAV (); 2501 AV *av = newAV ();
2359 SV **ary; 2502 SV **ary;
2360 2503
2361 /* unfortunately, building manually saves memory */ 2504 /* unfortunately, building manually saves memory */
2362 Newx (ary, 2, SV *); 2505 Newx (ary, 2, SV *);
2363 AvALLOC (av) = ary; 2506 AvALLOC (av) = ary;
2507#if PERL_VERSION_ATLEAST (5,10,0)
2364 /*AvARRAY (av) = ary;*/ 2508 AvARRAY (av) = ary;
2509#else
2365 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2510 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2511 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2512 SvPVX ((SV *)av) = (char *)ary;
2513#endif
2366 AvMAX (av) = 1; 2514 AvMAX (av) = 1;
2367 AvFILLp (av) = 0; 2515 AvFILLp (av) = 0;
2368 ary [0] = newSViv (count); 2516 ary [0] = newSViv (count);
2369 2517
2370 return newRV_noinc ((SV *)av); 2518 return newRV_noinc ((SV *)av);
2499{ 2647{
2500 if (items >= 2) 2648 if (items >= 2)
2501 { 2649 {
2502 /* callback form */ 2650 /* callback form */
2503 AV *av = (AV *)SvRV (arg [0]); 2651 AV *av = (AV *)SvRV (arg [0]);
2504 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2652 SV *cb_cv = s_get_cv_croak (arg [1]);
2505 2653
2506 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2507 2655
2508 if (SvIVX (AvARRAY (av)[0]) > 0) 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2509 coro_semaphore_adjust (aTHX_ av, 0); 2657 coro_semaphore_adjust (aTHX_ av, 0);
2510 2658
2511 frame->prepare = prepare_nop; 2659 frame->prepare = prepare_nop;
2535 AvARRAY (av)[0] = AvARRAY (av)[1]; 2683 AvARRAY (av)[0] = AvARRAY (av)[1];
2536 AvARRAY (av)[1] = cb; 2684 AvARRAY (av)[1] = cb;
2537 2685
2538 cb = av_shift (av); 2686 cb = av_shift (av);
2539 2687
2688 if (SvTYPE (cb) == SVt_PVCV)
2689 {
2690 dSP;
2691 PUSHMARK (SP);
2692 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2693 PUTBACK;
2694 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2695 }
2696 else
2697 {
2540 api_ready (aTHX_ cb); 2698 api_ready (aTHX_ cb);
2541 sv_setiv (cb, 0); /* signal waiter */ 2699 sv_setiv (cb, 0); /* signal waiter */
2700 }
2701
2542 SvREFCNT_dec (cb); 2702 SvREFCNT_dec (cb);
2543 2703
2544 --count; 2704 --count;
2545 } 2705 }
2546} 2706}
2555static void 2715static void
2556slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2716slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2557{ 2717{
2558 AV *av = (AV *)SvRV (arg [0]); 2718 AV *av = (AV *)SvRV (arg [0]);
2559 2719
2720 if (items >= 2)
2721 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2560 if (SvIVX (AvARRAY (av)[0])) 2725 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else if (SvIVX (AvARRAY (av)[0]))
2561 { 2732 {
2562 SvIVX (AvARRAY (av)[0]) = 0; 2733 SvIVX (AvARRAY (av)[0]) = 0;
2563 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2564 frame->check = slf_check_nop; 2735 frame->check = slf_check_nop;
2565 } 2736 }
2566 else 2737 else
2567 { 2738 {
2568 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2739 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2569 2740
2570 av_push (av, waiter); 2741 av_push (av, waiter);
2571 2742
2572 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2743 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2573 frame->prepare = prepare_schedule; 2744 frame->prepare = prepare_schedule;
2591 2762
2592static void 2763static void
2593coro_aio_callback (pTHX_ CV *cv) 2764coro_aio_callback (pTHX_ CV *cv)
2594{ 2765{
2595 dXSARGS; 2766 dXSARGS;
2596 AV *state = (AV *)GENSUB_ARG; 2767 AV *state = (AV *)S_GENSUB_ARG;
2597 SV *coro = av_pop (state); 2768 SV *coro = av_pop (state);
2598 SV *data_sv = newSV (sizeof (struct io_state)); 2769 SV *data_sv = newSV (sizeof (struct io_state));
2599 2770
2600 av_extend (state, items - 1); 2771 av_extend (state, items - 1);
2601 2772
2715 2886
2716 for (i = 0; i < items; ++i) 2887 for (i = 0; i < items; ++i)
2717 PUSHs (arg [i]); 2888 PUSHs (arg [i]);
2718 2889
2719 /* now push the callback closure */ 2890 /* now push the callback closure */
2720 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2891 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2721 2892
2722 /* now call the AIO function - we assume our request is uncancelable */ 2893 /* now call the AIO function - we assume our request is uncancelable */
2723 PUTBACK; 2894 PUTBACK;
2724 call_sv ((SV *)req, G_VOID | G_DISCARD); 2895 call_sv ((SV *)req, G_VOID | G_DISCARD);
2725 } 2896 }
2743/*****************************************************************************/ 2914/*****************************************************************************/
2744 2915
2745#if CORO_CLONE 2916#if CORO_CLONE
2746# include "clone.c" 2917# include "clone.c"
2747#endif 2918#endif
2919
2920/*****************************************************************************/
2921
2922static SV *
2923coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{
2925 SV *coro_sv;
2926 struct coro *coro;
2927 MAGIC *mg;
2928 HV *hv;
2929 SV *cb;
2930 int i;
2931
2932 if (argc > 0)
2933 {
2934 cb = s_get_cv_croak (argv [0]);
2935
2936 if (!is_coro)
2937 {
2938 if (CvISXSUB (cb))
2939 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2940
2941 if (!CvROOT (cb))
2942 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2943 }
2944 }
2945
2946 Newz (0, coro, 1, struct coro);
2947 coro->args = newAV ();
2948 coro->flags = CF_NEW;
2949
2950 if (coro_first) coro_first->prev = coro;
2951 coro->next = coro_first;
2952 coro_first = coro;
2953
2954 coro->hv = hv = newHV ();
2955 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2956 mg->mg_flags |= MGf_DUP;
2957 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2958
2959 if (argc > 0)
2960 {
2961 av_extend (coro->args, argc + is_coro - 1);
2962
2963 if (is_coro)
2964 {
2965 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2966 cb = (SV *)cv_coro_run;
2967 }
2968
2969 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2970
2971 for (i = 1; i < argc; i++)
2972 av_push (coro->args, newSVsv (argv [i]));
2973 }
2974
2975 return coro_sv;
2976}
2748 2977
2749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2750 2979
2751PROTOTYPES: DISABLE 2980PROTOTYPES: DISABLE
2752 2981
2812 3041
2813 if (!svp) croak ("Time::HiRes is required"); 3042 if (!svp) croak ("Time::HiRes is required");
2814 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2815 3044
2816 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2817 } 3049 }
2818 3050
2819 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2820} 3052}
2821 3053
2822SV * 3054SV *
2823new (char *klass, ...) 3055new (SV *klass, ...)
2824 ALIAS: 3056 ALIAS:
2825 Coro::new = 1 3057 Coro::new = 1
2826 CODE: 3058 CODE:
2827{ 3059 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2828 struct coro *coro; 3060 OUTPUT:
2829 MAGIC *mg;
2830 HV *hv;
2831 CV *cb;
2832 int i;
2833
2834 if (items > 1)
2835 {
2836 cb = coro_sv_2cv (aTHX_ ST (1));
2837
2838 if (!ix)
2839 {
2840 if (CvISXSUB (cb))
2841 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2842
2843 if (!CvROOT (cb))
2844 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2845 }
2846 }
2847
2848 Newz (0, coro, 1, struct coro);
2849 coro->args = newAV ();
2850 coro->flags = CF_NEW;
2851
2852 if (coro_first) coro_first->prev = coro;
2853 coro->next = coro_first;
2854 coro_first = coro;
2855
2856 coro->hv = hv = newHV ();
2857 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2858 mg->mg_flags |= MGf_DUP;
2859 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2860
2861 if (items > 1)
2862 {
2863 av_extend (coro->args, items - 1 + ix - 1);
2864
2865 if (ix)
2866 {
2867 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2868 cb = cv_coro_run;
2869 }
2870
2871 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2872
2873 for (i = 2; i < items; i++)
2874 av_push (coro->args, newSVsv (ST (i)));
2875 }
2876}
2877 OUTPUT:
2878 RETVAL 3061 RETVAL
2879 3062
2880void 3063void
2881transfer (...) 3064transfer (...)
2882 PROTOTYPE: $$ 3065 PROTOTYPE: $$
2899SV * 3082SV *
2900clone (Coro::State coro) 3083clone (Coro::State coro)
2901 CODE: 3084 CODE:
2902{ 3085{
2903#if CORO_CLONE 3086#if CORO_CLONE
2904 struct coro *ncoro = coro_clone (coro); 3087 struct coro *ncoro = coro_clone (aTHX_ coro);
2905 MAGIC *mg; 3088 MAGIC *mg;
2906 /* TODO: too much duplication */ 3089 /* TODO: too much duplication */
2907 ncoro->hv = newHV (); 3090 ncoro->hv = newHV ();
2908 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3091 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2909 mg->mg_flags |= MGf_DUP; 3092 mg->mg_flags |= MGf_DUP;
2971 eval = 1 3154 eval = 1
2972 CODE: 3155 CODE:
2973{ 3156{
2974 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2975 { 3158 {
2976 struct coro temp; 3159 struct coro *current = SvSTATE_current;
2977 3160
2978 if (!(coro->flags & CF_RUNNING)) 3161 if (current != coro)
2979 { 3162 {
2980 PUTBACK; 3163 PUTBACK;
2981 save_perl (aTHX_ &temp); 3164 save_perl (aTHX_ current);
2982 load_perl (aTHX_ coro); 3165 load_perl (aTHX_ coro);
3166 SPAGAIN;
2983 } 3167 }
2984 3168
2985 {
2986 dSP;
2987 ENTER;
2988 SAVETMPS;
2989 PUTBACK;
2990 PUSHSTACK; 3169 PUSHSTACK;
3170
2991 PUSHMARK (SP); 3171 PUSHMARK (SP);
3172 PUTBACK;
2992 3173
2993 if (ix) 3174 if (ix)
2994 eval_sv (coderef, 0); 3175 eval_sv (coderef, 0);
2995 else 3176 else
2996 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3177 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2997 3178
2998 POPSTACK; 3179 POPSTACK;
2999 SPAGAIN; 3180 SPAGAIN;
3000 FREETMPS;
3001 LEAVE;
3002 PUTBACK;
3003 }
3004 3181
3005 if (!(coro->flags & CF_RUNNING)) 3182 if (current != coro)
3006 { 3183 {
3184 PUTBACK;
3007 save_perl (aTHX_ coro); 3185 save_perl (aTHX_ coro);
3008 load_perl (aTHX_ &temp); 3186 load_perl (aTHX_ current);
3009 SPAGAIN; 3187 SPAGAIN;
3010 } 3188 }
3011 } 3189 }
3012} 3190}
3013 3191
3017 ALIAS: 3195 ALIAS:
3018 is_ready = CF_READY 3196 is_ready = CF_READY
3019 is_running = CF_RUNNING 3197 is_running = CF_RUNNING
3020 is_new = CF_NEW 3198 is_new = CF_NEW
3021 is_destroyed = CF_DESTROYED 3199 is_destroyed = CF_DESTROYED
3200 is_suspended = CF_SUSPENDED
3022 CODE: 3201 CODE:
3023 RETVAL = boolSV (coro->flags & ix); 3202 RETVAL = boolSV (coro->flags & ix);
3024 OUTPUT: 3203 OUTPUT:
3025 RETVAL 3204 RETVAL
3026 3205
3030 CODE: 3209 CODE:
3031{ 3210{
3032 struct coro *current = SvSTATE_current; 3211 struct coro *current = SvSTATE_current;
3033 SV **throwp = self == current ? &CORO_THROW : &self->except; 3212 SV **throwp = self == current ? &CORO_THROW : &self->except;
3034 SvREFCNT_dec (*throwp); 3213 SvREFCNT_dec (*throwp);
3214 SvGETMAGIC (throw);
3035 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3036} 3216}
3037 3217
3038void 3218void
3039api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3091 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3271 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3092 3272
3093 SV *tmp = *src; *src = *dst; *dst = tmp; 3273 SV *tmp = *src; *src = *dst; *dst = tmp;
3094 } 3274 }
3095 3275
3276void
3277cancel (Coro::State self)
3278 CODE:
3279 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282
3283SV *
3284enable_times (int enabled = enable_times)
3285 CODE:
3286{
3287 RETVAL = boolSV (enable_times);
3288
3289 if (enabled != enable_times)
3290 {
3291 enable_times = enabled;
3292
3293 coro_times_update ();
3294 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3295 }
3296}
3297 OUTPUT:
3298 RETVAL
3299
3300void
3301times (Coro::State self)
3302 PPCODE:
3303{
3304 struct coro *current = SvSTATE (coro_current);
3305
3306 if (expect_false (current == self))
3307 {
3308 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current));
3310 }
3311
3312 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315
3316 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current));
3318}
3096 3319
3097MODULE = Coro::State PACKAGE = Coro 3320MODULE = Coro::State PACKAGE = Coro
3098 3321
3099BOOT: 3322BOOT:
3100{ 3323{
3101 int i;
3102
3103 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3104 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3105 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3106 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3107 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3108 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3109 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3110 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3111 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3112 3333
3113 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3114 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3115 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3116 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3337 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3117 3338
3118 coro_stash = gv_stashpv ("Coro", TRUE); 3339 coro_stash = gv_stashpv ("Coro", TRUE);
3119 3340
3120 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3121 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3122 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3123 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3344 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3124 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3345 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3125 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3346 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3126
3127 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3128 coro_ready[i] = newAV ();
3129 3347
3130 { 3348 {
3131 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3349 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3132 3350
3133 coroapi.schedule = api_schedule; 3351 coroapi.schedule = api_schedule;
3143 sv_setiv (sv, (IV)&coroapi); 3361 sv_setiv (sv, (IV)&coroapi);
3144 SvREADONLY_on (sv); 3362 SvREADONLY_on (sv);
3145 } 3363 }
3146} 3364}
3147 3365
3366SV *
3367async (...)
3368 PROTOTYPE: &@
3369 CODE:
3370 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (aTHX_ RETVAL);
3372 OUTPUT:
3373 RETVAL
3374
3148void 3375void
3149terminate (...) 3376terminate (...)
3150 CODE: 3377 CODE:
3151 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3378 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3152 3379
3172 3399
3173void 3400void
3174cede_notself (...) 3401cede_notself (...)
3175 CODE: 3402 CODE:
3176 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3403 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3177
3178void
3179_cancel (Coro::State self)
3180 CODE:
3181 coro_state_destroy (aTHX_ self);
3182 coro_call_on_destroy (aTHX_ self);
3183 3404
3184void 3405void
3185_set_current (SV *current) 3406_set_current (SV *current)
3186 PROTOTYPE: $ 3407 PROTOTYPE: $
3187 CODE: 3408 CODE:
3191void 3412void
3192_set_readyhook (SV *hook) 3413_set_readyhook (SV *hook)
3193 PROTOTYPE: $ 3414 PROTOTYPE: $
3194 CODE: 3415 CODE:
3195 SvREFCNT_dec (coro_readyhook); 3416 SvREFCNT_dec (coro_readyhook);
3417 SvGETMAGIC (hook);
3418 if (SvOK (hook))
3419 {
3196 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3420 coro_readyhook = newSVsv (hook);
3421 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3422 }
3423 else
3424 {
3425 coro_readyhook = 0;
3426 CORO_READYHOOK = 0;
3427 }
3197 3428
3198int 3429int
3199prio (Coro::State coro, int newprio = 0) 3430prio (Coro::State coro, int newprio = 0)
3200 PROTOTYPE: $;$ 3431 PROTOTYPE: $;$
3201 ALIAS: 3432 ALIAS:
3207 if (items > 1) 3438 if (items > 1)
3208 { 3439 {
3209 if (ix) 3440 if (ix)
3210 newprio = coro->prio - newprio; 3441 newprio = coro->prio - newprio;
3211 3442
3212 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3443 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3213 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3444 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3214 3445
3215 coro->prio = newprio; 3446 coro->prio = newprio;
3216 } 3447 }
3217} 3448}
3218 OUTPUT: 3449 OUTPUT:
3233 RETVAL = coro_nready; 3464 RETVAL = coro_nready;
3234 OUTPUT: 3465 OUTPUT:
3235 RETVAL 3466 RETVAL
3236 3467
3237void 3468void
3469suspend (Coro::State self)
3470 PROTOTYPE: $
3471 CODE:
3472 self->flags |= CF_SUSPENDED;
3473
3474void
3475resume (Coro::State self)
3476 PROTOTYPE: $
3477 CODE:
3478 self->flags &= ~CF_SUSPENDED;
3479
3480void
3238_pool_handler (...) 3481_pool_handler (...)
3239 CODE: 3482 CODE:
3240 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3483 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3241 3484
3242void 3485void
3253 for (i = 1; i < items; ++i) 3496 for (i = 1; i < items; ++i)
3254 av_push (av, SvREFCNT_inc_NN (ST (i))); 3497 av_push (av, SvREFCNT_inc_NN (ST (i)));
3255 3498
3256 if ((SV *)hv == &PL_sv_undef) 3499 if ((SV *)hv == &PL_sv_undef)
3257 { 3500 {
3258 PUSHMARK (SP); 3501 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3259 EXTEND (SP, 2);
3260 PUSHs (sv_Coro);
3261 PUSHs ((SV *)cv_pool_handler);
3262 PUTBACK;
3263 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3264 SPAGAIN;
3265
3266 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3502 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3503 SvREFCNT_dec (sv);
3267 } 3504 }
3268 3505
3269 { 3506 {
3270 struct coro *coro = SvSTATE_hv (hv); 3507 struct coro *coro = SvSTATE_hv (hv);
3271 3508
3295rouse_wait (...) 3532rouse_wait (...)
3296 PROTOTYPE: ;$ 3533 PROTOTYPE: ;$
3297 PPCODE: 3534 PPCODE:
3298 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3535 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3299 3536
3537void
3538on_enter (SV *block)
3539 ALIAS:
3540 on_leave = 1
3541 PROTOTYPE: &
3542 CODE:
3543{
3544 struct coro *coro = SvSTATE_current;
3545 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3546
3547 block = s_get_cv_croak (block);
3548
3549 if (!*avp)
3550 *avp = newAV ();
3551
3552 av_push (*avp, SvREFCNT_inc (block));
3553
3554 if (!ix)
3555 on_enterleave_call (aTHX_ block);
3556
3557 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3558 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3559 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3560}
3561
3300 3562
3301MODULE = Coro::State PACKAGE = PerlIO::cede 3563MODULE = Coro::State PACKAGE = PerlIO::cede
3302 3564
3303BOOT: 3565BOOT:
3304 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3566 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3307MODULE = Coro::State PACKAGE = Coro::Semaphore 3569MODULE = Coro::State PACKAGE = Coro::Semaphore
3308 3570
3309SV * 3571SV *
3310new (SV *klass, SV *count = 0) 3572new (SV *klass, SV *count = 0)
3311 CODE: 3573 CODE:
3574{
3575 int semcnt = 1;
3576
3577 if (count)
3578 {
3579 SvGETMAGIC (count);
3580
3581 if (SvOK (count))
3582 semcnt = SvIV (count);
3583 }
3584
3312 RETVAL = sv_bless ( 3585 RETVAL = sv_bless (
3313 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3586 coro_waitarray_new (aTHX_ semcnt),
3314 GvSTASH (CvGV (cv)) 3587 GvSTASH (CvGV (cv))
3315 ); 3588 );
3589}
3316 OUTPUT: 3590 OUTPUT:
3317 RETVAL 3591 RETVAL
3318 3592
3319# helper for Coro::Channel 3593# helper for Coro::Channel and others
3320SV * 3594SV *
3321_alloc (int count) 3595_alloc (int count)
3322 CODE: 3596 CODE:
3323 RETVAL = coro_waitarray_new (aTHX_ count); 3597 RETVAL = coro_waitarray_new (aTHX_ count);
3324 OUTPUT: 3598 OUTPUT:
3382 for (i = 1; i <= wcount; ++i) 3656 for (i = 1; i <= wcount; ++i)
3383 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3657 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3384 } 3658 }
3385} 3659}
3386 3660
3661MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3662
3663void
3664_may_delete (SV *sem, int count, int extra_refs)
3665 PPCODE:
3666{
3667 AV *av = (AV *)SvRV (sem);
3668
3669 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3670 && AvFILLp (av) == 0 /* no waiters, just count */
3671 && SvIV (AvARRAY (av)[0]) == count)
3672 XSRETURN_YES;
3673
3674 XSRETURN_NO;
3675}
3676
3387MODULE = Coro::State PACKAGE = Coro::Signal 3677MODULE = Coro::State PACKAGE = Coro::Signal
3388 3678
3389SV * 3679SV *
3390new (SV *klass) 3680new (SV *klass)
3391 CODE: 3681 CODE:
3462 3752
3463void 3753void
3464_register (char *target, char *proto, SV *req) 3754_register (char *target, char *proto, SV *req)
3465 CODE: 3755 CODE:
3466{ 3756{
3467 CV *req_cv = coro_sv_2cv (aTHX_ req); 3757 SV *req_cv = s_get_cv_croak (req);
3468 /* newXSproto doesn't return the CV on 5.8 */ 3758 /* newXSproto doesn't return the CV on 5.8 */
3469 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3759 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3470 sv_setpv ((SV *)slf_cv, proto); 3760 sv_setpv ((SV *)slf_cv, proto);
3471 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3761 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3472} 3762}
3473 3763
3764MODULE = Coro::State PACKAGE = Coro::Select
3765
3766void
3767patch_pp_sselect ()
3768 CODE:
3769 if (!coro_old_pp_sselect)
3770 {
3771 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3772 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3773 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3774 }
3775
3776void
3777unpatch_pp_sselect ()
3778 CODE:
3779 if (coro_old_pp_sselect)
3780 {
3781 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3782 coro_old_pp_sselect = 0;
3783 }
3784
3785

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines