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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines