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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.380 by root, Sun Sep 12 03:06:38 2010 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
117#endif 64#endif
118 65
119#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
133#else 80#else
134# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
136#endif 83#endif
137 84
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
139 86
140#if __GNUC__ >= 3 87#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 90# define INLINE static inline
144#else 91#else
145# define attribute(x) 92# define attribute(x)
146# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
147# define INLINE static 94# define INLINE static
… …
159# if CORO_PTHREAD 106# if CORO_PTHREAD
160static void *coro_thx; 107static void *coro_thx;
161# endif 108# endif
162#endif 109#endif
163 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
164static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
165 123
166/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
169 127
… …
175static HV *coro_state_stash, *coro_stash; 133static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 134static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 135
178static AV *av_destroy; /* destruction queue */ 136static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 137static SV *sv_manager; /* the manager coro */
138static SV *sv_idle; /* $Coro::idle */
180 139
181static GV *irsgv; /* $/ */ 140static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 141static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 142static SV *rv_diehook;
184static SV *rv_warnhook; 143static SV *rv_warnhook;
… …
189static SV *sv_pool_size; 148static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 152static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 153
196/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
197static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
198 162
199static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
201 165
202enum { 166enum {
… …
237enum { 201enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
242}; 207};
243 208
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 210typedef struct
246{ 211{
247 SV *defsv; 212 SV *defsv;
248 AV *defav; 213 AV *defav;
249 SV *errsv; 214 SV *errsv;
250 SV *irsgv; 215 SV *irsgv;
216 HV *hinthv;
251#define VAR(name,type) type name; 217#define VAR(name,type) type name;
252# include "state.h" 218# include "state.h"
253#undef VAR 219#undef VAR
254} perl_slots; 220} perl_slots;
255 221
… …
257 223
258/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
259struct coro { 225struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 227 coro_cctx *cctx;
228
229 /* ready queue */
230 struct coro *next_ready;
262 231
263 /* state data */ 232 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 234 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
… …
283 /* async_pool */ 252 /* async_pool */
284 SV *saved_deffh; 253 SV *saved_deffh;
285 SV *invoke_cb; 254 SV *invoke_cb;
286 AV *invoke_av; 255 AV *invoke_av;
287 256
257 /* on_enter/on_leave */
258 AV *on_enter;
259 AV *on_leave;
260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
266
288 /* linked list */ 267 /* linked list */
289 struct coro *next, *prev; 268 struct coro *next, *prev;
290}; 269};
291 270
292typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
… …
297/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
299 278
300/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
301 280
302#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
308 287
309/* for Coro.pm */ 288/* for Coro.pm */
310static SV *coro_current; 289static SV *coro_current;
311static SV *coro_readyhook; 290static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 293static struct coro *coro_first;
315#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
316 315
317/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
318 317
319static SV * 318static SV *
320coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
344 get_hv (name, create); 343 get_hv (name, create);
345#endif 344#endif
346 return get_hv (name, create); 345 return get_hv (name, create);
347} 346}
348 347
349/* may croak */ 348INLINE void
350INLINE CV * 349coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 350{
351#ifdef coro_clock_gettime
352 struct timespec ts;
353
354 ts.tv_sec = ts.tv_nsec = 0;
355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
357
358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
393}
394
395/*****************************************************************************/
396/* magic glue */
397
398#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext
400
401#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \
404 : mg_find (sv, type))
405
406#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \
409 : 0)
410
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413
414INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro)
416{
353 HV *st; 417 HV *stash;
354 GV *gvp; 418 MAGIC *mg;
355 return sv_2cv (sv, &st, &gvp, 0); 419
420 if (SvROK (coro))
421 coro = SvRV (coro);
422
423 if (expect_false (SvTYPE (coro) != SVt_PVHV))
424 croak ("Coro::State object required");
425
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr;
356} 436}
437
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439
440/* faster than SvSTATE, but expects a coroutine hv */
441#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443
444/*****************************************************************************/
445/* padlist management and caching */
357 446
358static AV * 447static AV *
359coro_derive_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
360{ 449{
361 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
… …
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 459#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 461 --AvFILLp (padlist);
373 462
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
376 465
377 return newpadlist; 466 return newpadlist;
378} 467}
379 468
380static void 469static void
381free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
382{ 471{
383 /* may be during global destruction */ 472 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
385 { 474 {
386 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
387 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
388 { 478 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
390 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 481 I32 j = AvFILLp (av);
392 SV *sv; 482
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 488 }
399 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
401 } 494 }
402} 495}
403 496
404static int 497static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 499{
407 AV *padlist; 500 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
409 506
410 /* casting is fun. */ 507 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
413 510
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 512
416 return 0; 513 return 0;
417} 514}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 515
422static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 517 0, 0, 0, 0,
424 coro_cv_free 518 coro_cv_free
425}; 519};
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 520
470/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
471static void 522static void
472get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
473{ 524{
… …
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 553
503 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
504 555
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
507 558
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 560}
510 561
511/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
615static void
616on_enterleave_call (pTHX_ SV *cb);
512 617
513static void 618static void
514load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
515{ 620{
516 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
517 c->slot = 0; 622 c->slot = 0;
518 623
519 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
520 625
521 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
525 631
526 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 633 # include "state.h"
528 #undef VAR 634 #undef VAR
529 635
… …
543 PUTBACK; 649 PUTBACK;
544 } 650 }
545 651
546 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 653 CORO_THROW = c->except;
654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
663 if (expect_false (c->on_enter))
664 {
665 int i;
666
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 }
670
671 SWAP_SVS (c);
548} 672}
549 673
550static void 674static void
551save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
552{ 676{
677 SWAP_SVS (c);
678
679 if (expect_false (c->on_leave))
680 {
681 int i;
682
683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
693 }
694
553 c->except = CORO_THROW; 695 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
555 697
556 { 698 {
557 dSP; 699 dSP;
… …
570 { 712 {
571 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
572 { 714 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
574 716
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 718 {
577 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
578 720
579 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
580 { 722 {
… …
604 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
608 { 750 {
609 int i; 751 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 753 CXINC;
612 } 754 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 756
615 c->mainstack = PL_mainstack; 757 c->mainstack = PL_mainstack;
616 758
617 { 759 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 761
620 slot->defav = GvAV (PL_defgv); 762 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 763 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 764 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
624 767
625 #define VAR(name,type) slot->name = PL_ ## name; 768 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 769 # include "state.h"
627 #undef VAR 770 #undef VAR
628 } 771 }
… …
755#endif 898#endif
756 899
757/* 900/*
758 * This overrides the default magic get method of %SIG elements. 901 * 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 902 * 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 903 * and instead of trying to save and restore the hash elements, we just provide
761 * readback here. 904 * 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 */ 905 */
766static int 906static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 908{
769 const char *s = MgPV_nolen_const (mg); 909 const char *s = MgPV_nolen_const (mg);
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 963
824 if (svp) 964 if (svp)
825 { 965 {
826 SV *old = *svp; 966 SV *old = *svp;
827 *svp = newSVsv (sv); 967 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 968 SvREFCNT_dec (old);
829 return 0; 969 return 0;
830 } 970 }
831 } 971 }
832 972
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 990slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 991{
852 return 1; 992 return 1;
853} 993}
854 994
855static UNOP coro_setup_op; 995static UNOP init_perl_op;
856 996
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
859{ 999{
860 /* 1000 /*
861 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
862 */ 1002 */
863 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
864 1004
865 PL_runops = RUNOPS_DEFAULT; 1005 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1006 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1007 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1008 PL_comppad = 0;
1009 PL_comppad_name = 0;
1010 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1012 PL_curpm = 0;
870 PL_curpad = 0; 1013 PL_curpad = 0;
871 PL_localizing = 0; 1014 PL_localizing = 0;
872 PL_dirty = 0; 1015 PL_dirty = 0;
873 PL_restartop = 0; 1016 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1017#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1018 PL_parser = 0;
876#endif 1019#endif
1020 PL_hints = 0;
877 1021
878 /* recreate the die/warn hooks */ 1022 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1023 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); 1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
881 1025
882 GvSV (PL_defgv) = newSV (0); 1026 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1027 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1028 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 1031 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1033
889 { 1034 {
890 dSP; 1035 dSP;
… …
907 */ 1052 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
909 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
910 1055
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
912 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1058 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
916 1061
917 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
918 1063
919 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
921}
922 1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
1074}
1075
923static void 1076static void
924coro_destruct (pTHX_ struct coro *coro) 1077coro_unwind_stacks (pTHX)
925{ 1078{
926 if (!IN_DESTRUCT) 1079 if (!IN_DESTRUCT)
927 { 1080 {
928 /* restore all saved variables and stuff */ 1081 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1082 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1090 POPSTACK_TO (PL_mainstack);
938 1091
939 /* unwind main stack */ 1092 /* unwind main stack */
940 dounwind (-1); 1093 dounwind (-1);
941 } 1094 }
1095}
942 1096
943 SvREFCNT_dec (GvSV (PL_defgv)); 1097static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1098destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1099{
946 SvREFCNT_dec (PL_defoutgv); 1100 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1101
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1102 {
1103 struct coro *current = SvSTATE_current;
1104
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106
1107 save_perl (aTHX_ current);
1108 load_perl (aTHX_ coro);
1109
1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1115
1116 // now save some sv's to be free'd later
1117 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs;
1122 svf [5] = GvSV (irsgv);
1123 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf));
1127
1128 load_perl (aTHX_ current);
1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
953 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1139 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1140 SvREFCNT_dec (coro->invoke_av);
957 1141 }
958 coro_destruct_stacks (aTHX);
959} 1142}
960 1143
961INLINE void 1144INLINE void
962free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
963{ 1146{
… …
971static int 1154static int
972runops_trace (pTHX) 1155runops_trace (pTHX)
973{ 1156{
974 COP *oldcop = 0; 1157 COP *oldcop = 0;
975 int oldcxix = -2; 1158 int oldcxix = -2;
976 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
977 coro_cctx *cctx = coro->cctx;
978 1159
979 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
980 { 1161 {
981 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
982 1163
983 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
984 { 1165 {
985 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1166 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
986 { 1167 {
987 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
988 SV **bot, **top; 1169 SV **bot, **top;
989 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
990 SV **cb; 1171 SV **cb;
… …
1027 1208
1028 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
1029 { 1210 {
1030 SV **cb; 1211 SV **cb;
1031 1212
1032 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1033 { 1214 {
1034 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1035 1216
1036 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1037 { 1218 {
… …
1060 } 1241 }
1061 1242
1062 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1063 } 1244 }
1064 1245
1065 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1066 { 1247 {
1067 dSP; 1248 dSP;
1068 1249
1069 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1070 ENTER; 1251 ENTER;
… …
1162 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1163 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1164 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1165 /* 1346 /*
1166 * Unfortunately, there is no way to get at the return values of the 1347 * Unfortunately, there is no way to get at the return values of the
1167 * coro body here, as perl_run destroys these 1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1168 */ 1350 */
1169 1351
1170 /* 1352 /*
1171 * If perl-run returns we assume exit() was being called or the coro 1353 * If perl-run returns we assume exit() was being called or the coro
1172 * fell off the end, which seems to be the only valid (non-bug) 1354 * fell off the end, which seems to be the only valid (non-bug)
1173 * reason for perl_run to return. We try to exit by jumping to the 1355 * reason for perl_run to return. We try to exit by jumping to the
1174 * bootstrap-time "top" top_env, as we cannot restore the "main" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1175 * coroutine as Coro has no such concept 1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1176 */ 1360 */
1177 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1178 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1179 } 1363 }
1180} 1364}
… …
1257cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1258{ 1442{
1259 if (!cctx) 1443 if (!cctx)
1260 return; 1444 return;
1261 1445
1262 assert (cctx != cctx_current);//D temporary 1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1263 1447
1264 --cctx_count; 1448 --cctx_count;
1265 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1266 1450
1267 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
… …
1331 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1332 1516
1333 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1334 { 1518 {
1335 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1336 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1337 1521
1338 if (expect_false (next->flags & CF_RUNNING))
1339 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1340
1341 if (expect_false (next->flags & CF_DESTROYED)) 1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1342 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1343 1524
1344#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1345 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1346 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1347#endif 1528#endif
… …
1380 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1381 { 1562 {
1382 /* need to start coroutine */ 1563 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1565 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1386 } 1567 }
1387 else 1568 else
1388 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1389 1570
1390 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
… …
1395 )) 1576 ))
1396 { 1577 {
1397 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1578 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1398 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te)); 1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1399 1580
1400 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1581 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1401 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1582 /* without this the next cctx_get might destroy the running cctx while still in use */
1402 if (expect_false (CCTX_EXPIRED (cctx_current))) 1583 if (expect_false (CCTX_EXPIRED (cctx_current)))
1403 if (!next->cctx) 1584 if (expect_true (!next->cctx))
1404 next->cctx = cctx_get (aTHX); 1585 next->cctx = cctx_get (aTHX);
1405 1586
1406 cctx_put (cctx_current); 1587 cctx_put (cctx_current);
1407 assert (!prev->cctx);//D temporary
1408 } 1588 }
1409 else 1589 else
1410 prev->cctx = cctx_current; 1590 prev->cctx = cctx_current;
1411 1591
1412 ++next->usecount; 1592 ++next->usecount;
… …
1436coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1437{ 1617{
1438 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1439 return 0; 1619 return 0;
1440 1620
1441 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1442 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1443 1623
1444 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1445 1625
1446 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
… …
1450 --coro_nready; 1630 --coro_nready;
1451 } 1631 }
1452 else 1632 else
1453 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1454 1634
1455 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1456 { 1636 && coro->mainstack != main_mainstack
1457 struct coro temp; 1637 && coro->slot
1458 1638 && !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); 1639 destroy_perl (aTHX_ coro);
1463 1640
1464 coro_destruct (aTHX_ coro); 1641 if (coro->next) coro->next->prev = coro->prev;
1465 1642 if (coro->prev) coro->prev->next = coro->next;
1466 load_perl (aTHX_ &temp); 1643 if (coro == coro_first) coro_first = coro->next;
1467
1468 coro->slot = 0;
1469 }
1470 1644
1471 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1472 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1473 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1474 SvREFCNT_dec (CORO_THROW); 1649 SvREFCNT_dec (CORO_THROW);
1475
1476 if (coro->next) coro->next->prev = coro->prev;
1477 if (coro->prev) coro->prev->next = coro->next;
1478 if (coro == coro_first) coro_first = coro->next;
1479 1650
1480 return 1; 1651 return 1;
1481} 1652}
1482 1653
1483static int 1654static int
… …
1533 1704
1534 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1535 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1536} 1707}
1537 1708
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 ********************************************************************/ 1709/** Coro ********************************************************************/
1562 1710
1563INLINE void 1711INLINE void
1564coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1565{ 1713{
1566 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1567}
1568 1715
1569INLINE SV * 1716 SvREFCNT_inc_NN (coro->hv);
1717
1718 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro;
1721}
1722
1723INLINE struct coro *
1570coro_deq (pTHX) 1724coro_deq (pTHX)
1571{ 1725{
1572 int prio; 1726 int prio;
1573 1727
1574 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1575 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1576 return av_shift (coro_ready [prio]); 1730 struct coro **ready = coro_ready [prio];
1731
1732 if (ready [0])
1733 {
1734 struct coro *coro = ready [0];
1735 ready [0] = coro->next_ready;
1736 return coro;
1737 }
1738 }
1577 1739
1578 return 0; 1740 return 0;
1741}
1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1579} 1758}
1580 1759
1581static int 1760static int
1582api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1583{ 1762{
1584 struct coro *coro;
1585 SV *sv_hook;
1586 void (*xs_hook)(void);
1587
1588 if (SvROK (coro_sv))
1589 coro_sv = SvRV (coro_sv);
1590
1591 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1592 1764
1593 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1594 return 0; 1766 return 0;
1595 1767
1596 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1597 1769
1598 sv_hook = coro_nready ? 0 : coro_readyhook;
1599 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1600
1601 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1602 ++coro_nready;
1603 1771
1604 if (sv_hook) 1772 if (!coro_nready++)
1605 { 1773 if (coroapi.readyhook)
1606 dSP; 1774 coroapi.readyhook ();
1607
1608 ENTER;
1609 SAVETMPS;
1610
1611 PUSHMARK (SP);
1612 PUTBACK;
1613 call_sv (sv_hook, G_VOID | G_DISCARD);
1614
1615 FREETMPS;
1616 LEAVE;
1617 }
1618
1619 if (xs_hook)
1620 xs_hook ();
1621 1775
1622 return 1; 1776 return 1;
1623} 1777}
1624 1778
1625static int 1779static int
… …
1648static void 1802static void
1649prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1650{ 1804{
1651 for (;;) 1805 for (;;)
1652 { 1806 {
1653 SV *next_sv = coro_deq (aTHX); 1807 struct coro *next = coro_deq (aTHX);
1654 1808
1655 if (expect_true (next_sv)) 1809 if (expect_true (next))
1656 { 1810 {
1657 struct coro *next = SvSTATE_hv (next_sv);
1658
1659 /* cannot transfer to destroyed coros, skip and look for next */ 1811 /* cannot transfer to destroyed coros, skip and look for next */
1660 if (expect_false (next->flags & CF_DESTROYED)) 1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1661 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1662 else 1814 else
1663 { 1815 {
1664 next->flags &= ~CF_READY; 1816 next->flags &= ~CF_READY;
1665 --coro_nready; 1817 --coro_nready;
1666 1818
… …
1669 } 1821 }
1670 } 1822 }
1671 else 1823 else
1672 { 1824 {
1673 /* nothing to schedule: call the idle handler */ 1825 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle)))
1828 {
1829 if (SvRV (sv_idle) == SvRV (coro_current))
1830 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1831
1832 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1833 api_ready (aTHX_ SvRV (sv_idle));
1834 --coro_nready;
1835 }
1836 else
1837 {
1838 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1674 dSP; 1839 dSP;
1675 1840
1676 ENTER; 1841 ENTER;
1677 SAVETMPS; 1842 SAVETMPS;
1678 1843
1679 PUSHMARK (SP); 1844 PUSHMARK (SP);
1680 PUTBACK; 1845 PUTBACK;
1681 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1846 call_sv (sv_idle, G_VOID | G_DISCARD);
1682 1847
1683 FREETMPS; 1848 FREETMPS;
1684 LEAVE; 1849 LEAVE;
1850 }
1685 } 1851 }
1686 } 1852 }
1687} 1853}
1688 1854
1689INLINE void 1855INLINE void
… …
1760static void 1926static void
1761api_trace (pTHX_ SV *coro_sv, int flags) 1927api_trace (pTHX_ SV *coro_sv, int flags)
1762{ 1928{
1763 struct coro *coro = SvSTATE (coro_sv); 1929 struct coro *coro = SvSTATE (coro_sv);
1764 1930
1931 if (coro->flags & CF_RUNNING)
1932 croak ("cannot enable tracing on a running coroutine, caught");
1933
1765 if (flags & CC_TRACE) 1934 if (flags & CC_TRACE)
1766 { 1935 {
1767 if (!coro->cctx) 1936 if (!coro->cctx)
1768 coro->cctx = cctx_new_run (); 1937 coro->cctx = cctx_new_run ();
1769 else if (!(coro->cctx->flags & CC_TRACE)) 1938 else if (!(coro->cctx->flags & CC_TRACE))
1770 croak ("cannot enable tracing on coroutine with custom stack,"); 1939 croak ("cannot enable tracing on coroutine with custom stack, caught");
1771 1940
1772 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1941 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1773 } 1942 }
1774 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1943 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1775 { 1944 {
… …
1820{ 1989{
1821 int i; 1990 int i;
1822 HV *hv = (HV *)SvRV (coro_current); 1991 HV *hv = (HV *)SvRV (coro_current);
1823 AV *av = newAV (); 1992 AV *av = newAV ();
1824 1993
1994 /* items are actually not so common, so optimise for this case */
1995 if (items)
1996 {
1825 av_extend (av, items - 1); 1997 av_extend (av, items - 1);
1998
1826 for (i = 0; i < items; ++i) 1999 for (i = 0; i < items; ++i)
1827 av_push (av, SvREFCNT_inc_NN (arg [i])); 2000 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 }
1828 2002
1829 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1830 2004
1831 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1832 api_ready (aTHX_ sv_manager); 2006 api_ready (aTHX_ sv_manager);
1833 2007
1834 frame->prepare = prepare_schedule; 2008 frame->prepare = prepare_schedule;
1835 frame->check = slf_check_repeat; 2009 frame->check = slf_check_repeat;
2010
2011 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/
1836} 2014}
1837 2015
1838/*****************************************************************************/ 2016/*****************************************************************************/
1839/* async pool handler */ 2017/* async pool handler */
1840 2018
… …
1918 2096
1919static void 2097static void
1920coro_rouse_callback (pTHX_ CV *cv) 2098coro_rouse_callback (pTHX_ CV *cv)
1921{ 2099{
1922 dXSARGS; 2100 dXSARGS;
1923 SV *data = (SV *)GENSUB_ARG; 2101 SV *data = (SV *)S_GENSUB_ARG;
1924 2102
1925 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2103 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1926 { 2104 {
1927 /* first call, set args */ 2105 /* first call, set args */
2106 SV *coro = SvRV (data);
1928 AV *av = newAV (); 2107 AV *av = newAV ();
1929 SV *coro = SvRV (data);
1930 2108
1931 SvRV_set (data, (SV *)av); 2109 SvRV_set (data, (SV *)av);
1932 api_ready (aTHX_ coro);
1933 SvREFCNT_dec (coro);
1934 2110
1935 /* better take a full copy of the arguments */ 2111 /* better take a full copy of the arguments */
1936 while (items--) 2112 while (items--)
1937 av_store (av, items, newSVsv (ST (items))); 2113 av_store (av, items, newSVsv (ST (items)));
2114
2115 api_ready (aTHX_ coro);
2116 SvREFCNT_dec (coro);
1938 } 2117 }
1939 2118
1940 XSRETURN_EMPTY; 2119 XSRETURN_EMPTY;
1941} 2120}
1942 2121
… …
1959 2138
1960 EXTEND (SP, AvFILLp (av) + 1); 2139 EXTEND (SP, AvFILLp (av) + 1);
1961 for (i = 0; i <= AvFILLp (av); ++i) 2140 for (i = 0; i <= AvFILLp (av); ++i)
1962 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2141 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1963 2142
1964 /* we have stolen the elements, so ste length to zero and free */ 2143 /* we have stolen the elements, so set length to zero and free */
1965 AvFILLp (av) = -1; 2144 AvFILLp (av) = -1;
1966 av_undef (av); 2145 av_undef (av);
1967 2146
1968 PUTBACK; 2147 PUTBACK;
1969 } 2148 }
… …
1993 || SvTYPE (SvRV (cb)) != SVt_PVCV 2172 || SvTYPE (SvRV (cb)) != SVt_PVCV
1994 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1995 croak ("Coro::rouse_wait called with illegal callback argument,"); 2174 croak ("Coro::rouse_wait called with illegal callback argument,");
1996 2175
1997 { 2176 {
1998 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1999 SV *data = (SV *)GENSUB_ARG; 2178 SV *data = (SV *)S_GENSUB_ARG;
2000 2179
2001 frame->data = (void *)data; 2180 frame->data = (void *)data;
2002 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2003 frame->check = slf_check_rouse_wait; 2182 frame->check = slf_check_rouse_wait;
2004 } 2183 }
… …
2008coro_new_rouse_cb (pTHX) 2187coro_new_rouse_cb (pTHX)
2009{ 2188{
2010 HV *hv = (HV *)SvRV (coro_current); 2189 HV *hv = (HV *)SvRV (coro_current);
2011 struct coro *coro = SvSTATE_hv (hv); 2190 struct coro *coro = SvSTATE_hv (hv);
2012 SV *data = newRV_inc ((SV *)hv); 2191 SV *data = newRV_inc ((SV *)hv);
2013 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2014 2193
2015 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2194 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2016 SvREFCNT_dec (data); /* magicext increases the refcount */ 2195 SvREFCNT_dec (data); /* magicext increases the refcount */
2017 2196
2018 SvREFCNT_dec (coro->rouse_cb); 2197 SvREFCNT_dec (coro->rouse_cb);
… …
2243 if (PL_op->op_flags & OPf_STACKED) 2422 if (PL_op->op_flags & OPf_STACKED)
2244 { 2423 {
2245 if (items > slf_arga) 2424 if (items > slf_arga)
2246 { 2425 {
2247 slf_arga = items; 2426 slf_arga = items;
2248 free (slf_argv); 2427 Safefree (slf_argv);
2249 slf_argv = malloc (slf_arga * sizeof (SV *)); 2428 New (0, slf_argv, slf_arga, SV *);
2250 } 2429 }
2251 2430
2252 slf_argc = items; 2431 slf_argc = items;
2253 2432
2254 for (i = 0; i < items; ++i) 2433 for (i = 0; i < items; ++i)
… …
2259 2438
2260 PL_op->op_ppaddr = pp_slf; 2439 PL_op->op_ppaddr = pp_slf;
2261 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2440 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2262 2441
2263 PL_op = (OP *)&slf_restore; 2442 PL_op = (OP *)&slf_restore;
2443}
2444
2445/*****************************************************************************/
2446/* dynamic wind */
2447
2448static void
2449on_enterleave_call (pTHX_ SV *cb)
2450{
2451 dSP;
2452
2453 PUSHSTACK;
2454
2455 PUSHMARK (SP);
2456 PUTBACK;
2457 call_sv (cb, G_VOID | G_DISCARD);
2458 SPAGAIN;
2459
2460 POPSTACK;
2461}
2462
2463static SV *
2464coro_avp_pop_and_free (pTHX_ AV **avp)
2465{
2466 AV *av = *avp;
2467 SV *res = av_pop (av);
2468
2469 if (AvFILLp (av) < 0)
2470 {
2471 *avp = 0;
2472 SvREFCNT_dec (av);
2473 }
2474
2475 return res;
2476}
2477
2478static void
2479coro_pop_on_enter (pTHX_ void *coro)
2480{
2481 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2482 SvREFCNT_dec (cb);
2483}
2484
2485static void
2486coro_pop_on_leave (pTHX_ void *coro)
2487{
2488 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2489 on_enterleave_call (aTHX_ sv_2mortal (cb));
2264} 2490}
2265 2491
2266/*****************************************************************************/ 2492/*****************************************************************************/
2267/* PerlIO::cede */ 2493/* PerlIO::cede */
2268 2494
… …
2342/* Coro::Semaphore & Coro::Signal */ 2568/* Coro::Semaphore & Coro::Signal */
2343 2569
2344static SV * 2570static SV *
2345coro_waitarray_new (pTHX_ int count) 2571coro_waitarray_new (pTHX_ int count)
2346{ 2572{
2347 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2573 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2348 AV *av = newAV (); 2574 AV *av = newAV ();
2349 SV **ary; 2575 SV **ary;
2350 2576
2351 /* unfortunately, building manually saves memory */ 2577 /* unfortunately, building manually saves memory */
2352 Newx (ary, 2, SV *); 2578 Newx (ary, 2, SV *);
2353 AvALLOC (av) = ary; 2579 AvALLOC (av) = ary;
2580#if PERL_VERSION_ATLEAST (5,10,0)
2354 /*AvARRAY (av) = ary;*/ 2581 AvARRAY (av) = ary;
2582#else
2355 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2583 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2584 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2585 SvPVX ((SV *)av) = (char *)ary;
2586#endif
2356 AvMAX (av) = 1; 2587 AvMAX (av) = 1;
2357 AvFILLp (av) = 0; 2588 AvFILLp (av) = 0;
2358 ary [0] = newSViv (count); 2589 ary [0] = newSViv (count);
2359 2590
2360 return newRV_noinc ((SV *)av); 2591 return newRV_noinc ((SV *)av);
… …
2489{ 2720{
2490 if (items >= 2) 2721 if (items >= 2)
2491 { 2722 {
2492 /* callback form */ 2723 /* callback form */
2493 AV *av = (AV *)SvRV (arg [0]); 2724 AV *av = (AV *)SvRV (arg [0]);
2494 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2725 SV *cb_cv = s_get_cv_croak (arg [1]);
2495 2726
2496 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2727 av_push (av, SvREFCNT_inc_NN (cb_cv));
2497 2728
2498 if (SvIVX (AvARRAY (av)[0]) > 0) 2729 if (SvIVX (AvARRAY (av)[0]) > 0)
2499 coro_semaphore_adjust (aTHX_ av, 0); 2730 coro_semaphore_adjust (aTHX_ av, 0);
2500 2731
2501 frame->prepare = prepare_nop; 2732 frame->prepare = prepare_nop;
… …
2525 AvARRAY (av)[0] = AvARRAY (av)[1]; 2756 AvARRAY (av)[0] = AvARRAY (av)[1];
2526 AvARRAY (av)[1] = cb; 2757 AvARRAY (av)[1] = cb;
2527 2758
2528 cb = av_shift (av); 2759 cb = av_shift (av);
2529 2760
2761 if (SvTYPE (cb) == SVt_PVCV)
2762 {
2763 dSP;
2764 PUSHMARK (SP);
2765 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2766 PUTBACK;
2767 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2768 }
2769 else
2770 {
2530 api_ready (aTHX_ cb); 2771 api_ready (aTHX_ cb);
2531 sv_setiv (cb, 0); /* signal waiter */ 2772 sv_setiv (cb, 0); /* signal waiter */
2773 }
2774
2532 SvREFCNT_dec (cb); 2775 SvREFCNT_dec (cb);
2533 2776
2534 --count; 2777 --count;
2535 } 2778 }
2536} 2779}
… …
2545static void 2788static void
2546slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2789slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2547{ 2790{
2548 AV *av = (AV *)SvRV (arg [0]); 2791 AV *av = (AV *)SvRV (arg [0]);
2549 2792
2793 if (items >= 2)
2794 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797
2550 if (SvIVX (AvARRAY (av)[0])) 2798 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2800
2801 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop;
2803 }
2804 else if (SvIVX (AvARRAY (av)[0]))
2551 { 2805 {
2552 SvIVX (AvARRAY (av)[0]) = 0; 2806 SvIVX (AvARRAY (av)[0]) = 0;
2553 frame->prepare = prepare_nop; 2807 frame->prepare = prepare_nop;
2554 frame->check = slf_check_nop; 2808 frame->check = slf_check_nop;
2555 } 2809 }
2556 else 2810 else
2557 { 2811 {
2558 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2812 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2559 2813
2560 av_push (av, waiter); 2814 av_push (av, waiter);
2561 2815
2562 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2816 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2563 frame->prepare = prepare_schedule; 2817 frame->prepare = prepare_schedule;
… …
2581 2835
2582static void 2836static void
2583coro_aio_callback (pTHX_ CV *cv) 2837coro_aio_callback (pTHX_ CV *cv)
2584{ 2838{
2585 dXSARGS; 2839 dXSARGS;
2586 AV *state = (AV *)GENSUB_ARG; 2840 AV *state = (AV *)S_GENSUB_ARG;
2587 SV *coro = av_pop (state); 2841 SV *coro = av_pop (state);
2588 SV *data_sv = newSV (sizeof (struct io_state)); 2842 SV *data_sv = newSV (sizeof (struct io_state));
2589 2843
2590 av_extend (state, items - 1); 2844 av_extend (state, items - 1);
2591 2845
… …
2705 2959
2706 for (i = 0; i < items; ++i) 2960 for (i = 0; i < items; ++i)
2707 PUSHs (arg [i]); 2961 PUSHs (arg [i]);
2708 2962
2709 /* now push the callback closure */ 2963 /* now push the callback closure */
2710 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2964 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2711 2965
2712 /* now call the AIO function - we assume our request is uncancelable */ 2966 /* now call the AIO function - we assume our request is uncancelable */
2713 PUTBACK; 2967 PUTBACK;
2714 call_sv ((SV *)req, G_VOID | G_DISCARD); 2968 call_sv ((SV *)req, G_VOID | G_DISCARD);
2715 } 2969 }
2716 2970
2717 /* now that the requets is going, we loop toll we have a result */ 2971 /* now that the request is going, we loop till we have a result */
2718 frame->data = (void *)state; 2972 frame->data = (void *)state;
2719 frame->prepare = prepare_schedule; 2973 frame->prepare = prepare_schedule;
2720 frame->check = slf_check_aio_req; 2974 frame->check = slf_check_aio_req;
2721} 2975}
2722 2976
… …
2733/*****************************************************************************/ 2987/*****************************************************************************/
2734 2988
2735#if CORO_CLONE 2989#if CORO_CLONE
2736# include "clone.c" 2990# include "clone.c"
2737#endif 2991#endif
2992
2993/*****************************************************************************/
2994
2995static SV *
2996coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2997{
2998 SV *coro_sv;
2999 struct coro *coro;
3000 MAGIC *mg;
3001 HV *hv;
3002 SV *cb;
3003 int i;
3004
3005 if (argc > 0)
3006 {
3007 cb = s_get_cv_croak (argv [0]);
3008
3009 if (!is_coro)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3031
3032 if (argc > 0)
3033 {
3034 av_extend (coro->args, argc + is_coro - 1);
3035
3036 if (is_coro)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = (SV *)cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 1; i < argc; i++)
3045 av_push (coro->args, newSVsv (argv [i]));
3046 }
3047
3048 return coro_sv;
3049}
2738 3050
2739MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2740 3052
2741PROTOTYPES: DISABLE 3053PROTOTYPES: DISABLE
2742 3054
… …
2802 3114
2803 if (!svp) croak ("Time::HiRes is required"); 3115 if (!svp) croak ("Time::HiRes is required");
2804 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2805 3117
2806 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2807 } 3122 }
2808 3123
2809 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2810} 3125}
2811 3126
2812SV * 3127SV *
2813new (char *klass, ...) 3128new (SV *klass, ...)
2814 ALIAS: 3129 ALIAS:
2815 Coro::new = 1 3130 Coro::new = 1
2816 CODE: 3131 CODE:
2817{ 3132 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2818 struct coro *coro; 3133 OUTPUT:
2819 MAGIC *mg;
2820 HV *hv;
2821 CV *cb;
2822 int i;
2823
2824 if (items > 1)
2825 {
2826 cb = coro_sv_2cv (aTHX_ ST (1));
2827
2828 if (!ix)
2829 {
2830 if (CvISXSUB (cb))
2831 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2832
2833 if (!CvROOT (cb))
2834 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2835 }
2836 }
2837
2838 Newz (0, coro, 1, struct coro);
2839 coro->args = newAV ();
2840 coro->flags = CF_NEW;
2841
2842 if (coro_first) coro_first->prev = coro;
2843 coro->next = coro_first;
2844 coro_first = coro;
2845
2846 coro->hv = hv = newHV ();
2847 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2848 mg->mg_flags |= MGf_DUP;
2849 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2850
2851 if (items > 1)
2852 {
2853 av_extend (coro->args, items - 1 + ix - 1);
2854
2855 if (ix)
2856 {
2857 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2858 cb = cv_coro_run;
2859 }
2860
2861 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2862
2863 for (i = 2; i < items; i++)
2864 av_push (coro->args, newSVsv (ST (i)));
2865 }
2866}
2867 OUTPUT:
2868 RETVAL 3134 RETVAL
2869 3135
2870void 3136void
2871transfer (...) 3137transfer (...)
2872 PROTOTYPE: $$ 3138 PROTOTYPE: $$
… …
2889SV * 3155SV *
2890clone (Coro::State coro) 3156clone (Coro::State coro)
2891 CODE: 3157 CODE:
2892{ 3158{
2893#if CORO_CLONE 3159#if CORO_CLONE
2894 struct coro *ncoro = coro_clone (coro); 3160 struct coro *ncoro = coro_clone (aTHX_ coro);
2895 MAGIC *mg; 3161 MAGIC *mg;
2896 /* TODO: too much duplication */ 3162 /* TODO: too much duplication */
2897 ncoro->hv = newHV (); 3163 ncoro->hv = newHV ();
2898 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3164 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2899 mg->mg_flags |= MGf_DUP; 3165 mg->mg_flags |= MGf_DUP;
… …
2961 eval = 1 3227 eval = 1
2962 CODE: 3228 CODE:
2963{ 3229{
2964 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2965 { 3231 {
2966 struct coro temp; 3232 struct coro *current = SvSTATE_current;
2967 3233
2968 if (!(coro->flags & CF_RUNNING)) 3234 if (current != coro)
2969 { 3235 {
2970 PUTBACK; 3236 PUTBACK;
2971 save_perl (aTHX_ &temp); 3237 save_perl (aTHX_ current);
2972 load_perl (aTHX_ coro); 3238 load_perl (aTHX_ coro);
3239 SPAGAIN;
2973 } 3240 }
2974 3241
2975 {
2976 dSP;
2977 ENTER;
2978 SAVETMPS;
2979 PUTBACK;
2980 PUSHSTACK; 3242 PUSHSTACK;
3243
2981 PUSHMARK (SP); 3244 PUSHMARK (SP);
3245 PUTBACK;
2982 3246
2983 if (ix) 3247 if (ix)
2984 eval_sv (coderef, 0); 3248 eval_sv (coderef, 0);
2985 else 3249 else
2986 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3250 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2987 3251
2988 POPSTACK; 3252 POPSTACK;
2989 SPAGAIN; 3253 SPAGAIN;
2990 FREETMPS;
2991 LEAVE;
2992 PUTBACK;
2993 }
2994 3254
2995 if (!(coro->flags & CF_RUNNING)) 3255 if (current != coro)
2996 { 3256 {
3257 PUTBACK;
2997 save_perl (aTHX_ coro); 3258 save_perl (aTHX_ coro);
2998 load_perl (aTHX_ &temp); 3259 load_perl (aTHX_ current);
2999 SPAGAIN; 3260 SPAGAIN;
3000 } 3261 }
3001 } 3262 }
3002} 3263}
3003 3264
… …
3007 ALIAS: 3268 ALIAS:
3008 is_ready = CF_READY 3269 is_ready = CF_READY
3009 is_running = CF_RUNNING 3270 is_running = CF_RUNNING
3010 is_new = CF_NEW 3271 is_new = CF_NEW
3011 is_destroyed = CF_DESTROYED 3272 is_destroyed = CF_DESTROYED
3273 is_suspended = CF_SUSPENDED
3012 CODE: 3274 CODE:
3013 RETVAL = boolSV (coro->flags & ix); 3275 RETVAL = boolSV (coro->flags & ix);
3014 OUTPUT: 3276 OUTPUT:
3015 RETVAL 3277 RETVAL
3016 3278
3017void 3279void
3018throw (Coro::State self, SV *throw = &PL_sv_undef) 3280throw (Coro::State self, SV *exception = &PL_sv_undef)
3019 PROTOTYPE: $;$ 3281 PROTOTYPE: $;$
3020 CODE: 3282 CODE:
3021{ 3283{
3022 struct coro *current = SvSTATE_current; 3284 struct coro *current = SvSTATE_current;
3023 SV **throwp = self == current ? &CORO_THROW : &self->except; 3285 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3024 SvREFCNT_dec (*throwp); 3286 SvREFCNT_dec (*exceptionp);
3025 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3287 SvGETMAGIC (exception);
3288 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3026} 3289}
3027 3290
3028void 3291void
3029api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3030 PROTOTYPE: $;$ 3293 PROTOTYPE: $;$
… …
3032 3295
3033SV * 3296SV *
3034has_cctx (Coro::State coro) 3297has_cctx (Coro::State coro)
3035 PROTOTYPE: $ 3298 PROTOTYPE: $
3036 CODE: 3299 CODE:
3037 RETVAL = boolSV (!!coro->cctx); 3300 /* maybe manage the running flag differently */
3301 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3038 OUTPUT: 3302 OUTPUT:
3039 RETVAL 3303 RETVAL
3040 3304
3041int 3305int
3042is_traced (Coro::State coro) 3306is_traced (Coro::State coro)
… …
3062 3326
3063void 3327void
3064force_cctx () 3328force_cctx ()
3065 PROTOTYPE: 3329 PROTOTYPE:
3066 CODE: 3330 CODE:
3067 SvSTATE_current->cctx->idle_sp = 0; 3331 cctx_current->idle_sp = 0;
3068 3332
3069void 3333void
3070swap_defsv (Coro::State self) 3334swap_defsv (Coro::State self)
3071 PROTOTYPE: $ 3335 PROTOTYPE: $
3072 ALIAS: 3336 ALIAS:
… …
3080 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3344 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3081 3345
3082 SV *tmp = *src; *src = *dst; *dst = tmp; 3346 SV *tmp = *src; *src = *dst; *dst = tmp;
3083 } 3347 }
3084 3348
3349void
3350cancel (Coro::State self)
3351 CODE:
3352 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355
3356SV *
3357enable_times (int enabled = enable_times)
3358 CODE:
3359{
3360 RETVAL = boolSV (enable_times);
3361
3362 if (enabled != enable_times)
3363 {
3364 enable_times = enabled;
3365
3366 coro_times_update ();
3367 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3368 }
3369}
3370 OUTPUT:
3371 RETVAL
3372
3373void
3374times (Coro::State self)
3375 PPCODE:
3376{
3377 struct coro *current = SvSTATE (coro_current);
3378
3379 if (expect_false (current == self))
3380 {
3381 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current));
3383 }
3384
3385 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388
3389 if (expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current));
3391}
3392
3393void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3395 CODE:
3396{
3397 struct coro *current = SvSTATE_current;
3398
3399 if (current == coro)
3400 SWAP_SVS (current);
3401
3402 if (!coro->swap_sv)
3403 coro->swap_sv = newAV ();
3404
3405 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3406 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3407
3408 if (current == coro)
3409 SWAP_SVS (current);
3410}
3411
3085 3412
3086MODULE = Coro::State PACKAGE = Coro 3413MODULE = Coro::State PACKAGE = Coro
3087 3414
3088BOOT: 3415BOOT:
3089{ 3416{
3090 int i;
3091
3092 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3093 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3094 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3095 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3096 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3097 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3098 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3099 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3100 3426
3101 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3102 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3103 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3104 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3105 3431
3106 coro_stash = gv_stashpv ("Coro", TRUE); 3432 coro_stash = gv_stashpv ("Coro", TRUE);
3107 3433
3108 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3109 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3110 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3111 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3437 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3112 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3438 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3113 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3439 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3114
3115 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3116 coro_ready[i] = newAV ();
3117 3440
3118 { 3441 {
3119 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3442 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3120 3443
3121 coroapi.schedule = api_schedule; 3444 coroapi.schedule = api_schedule;
… …
3131 sv_setiv (sv, (IV)&coroapi); 3454 sv_setiv (sv, (IV)&coroapi);
3132 SvREADONLY_on (sv); 3455 SvREADONLY_on (sv);
3133 } 3456 }
3134} 3457}
3135 3458
3459SV *
3460async (...)
3461 PROTOTYPE: &@
3462 CODE:
3463 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3464 api_ready (aTHX_ RETVAL);
3465 OUTPUT:
3466 RETVAL
3467
3136void 3468void
3137terminate (...) 3469terminate (...)
3138 CODE: 3470 CODE:
3139 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3471 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3140 3472
… …
3160 3492
3161void 3493void
3162cede_notself (...) 3494cede_notself (...)
3163 CODE: 3495 CODE:
3164 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3496 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3165
3166void
3167_cancel (Coro::State self)
3168 CODE:
3169 coro_state_destroy (aTHX_ self);
3170 coro_call_on_destroy (aTHX_ self);
3171 3497
3172void 3498void
3173_set_current (SV *current) 3499_set_current (SV *current)
3174 PROTOTYPE: $ 3500 PROTOTYPE: $
3175 CODE: 3501 CODE:
… …
3179void 3505void
3180_set_readyhook (SV *hook) 3506_set_readyhook (SV *hook)
3181 PROTOTYPE: $ 3507 PROTOTYPE: $
3182 CODE: 3508 CODE:
3183 SvREFCNT_dec (coro_readyhook); 3509 SvREFCNT_dec (coro_readyhook);
3510 SvGETMAGIC (hook);
3511 if (SvOK (hook))
3512 {
3184 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3513 coro_readyhook = newSVsv (hook);
3514 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3515 }
3516 else
3517 {
3518 coro_readyhook = 0;
3519 CORO_READYHOOK = 0;
3520 }
3185 3521
3186int 3522int
3187prio (Coro::State coro, int newprio = 0) 3523prio (Coro::State coro, int newprio = 0)
3188 PROTOTYPE: $;$ 3524 PROTOTYPE: $;$
3189 ALIAS: 3525 ALIAS:
… …
3195 if (items > 1) 3531 if (items > 1)
3196 { 3532 {
3197 if (ix) 3533 if (ix)
3198 newprio = coro->prio - newprio; 3534 newprio = coro->prio - newprio;
3199 3535
3200 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3536 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3201 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3537 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3202 3538
3203 coro->prio = newprio; 3539 coro->prio = newprio;
3204 } 3540 }
3205} 3541}
3206 OUTPUT: 3542 OUTPUT:
… …
3221 RETVAL = coro_nready; 3557 RETVAL = coro_nready;
3222 OUTPUT: 3558 OUTPUT:
3223 RETVAL 3559 RETVAL
3224 3560
3225void 3561void
3562suspend (Coro::State self)
3563 PROTOTYPE: $
3564 CODE:
3565 self->flags |= CF_SUSPENDED;
3566
3567void
3568resume (Coro::State self)
3569 PROTOTYPE: $
3570 CODE:
3571 self->flags &= ~CF_SUSPENDED;
3572
3573void
3226_pool_handler (...) 3574_pool_handler (...)
3227 CODE: 3575 CODE:
3228 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3576 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3229 3577
3230void 3578void
… …
3241 for (i = 1; i < items; ++i) 3589 for (i = 1; i < items; ++i)
3242 av_push (av, SvREFCNT_inc_NN (ST (i))); 3590 av_push (av, SvREFCNT_inc_NN (ST (i)));
3243 3591
3244 if ((SV *)hv == &PL_sv_undef) 3592 if ((SV *)hv == &PL_sv_undef)
3245 { 3593 {
3246 PUSHMARK (SP); 3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3247 EXTEND (SP, 2);
3248 PUSHs (sv_Coro);
3249 PUSHs ((SV *)cv_pool_handler);
3250 PUTBACK;
3251 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3252 SPAGAIN;
3253
3254 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3596 SvREFCNT_dec (sv);
3255 } 3597 }
3256 3598
3257 { 3599 {
3258 struct coro *coro = SvSTATE_hv (hv); 3600 struct coro *coro = SvSTATE_hv (hv);
3259 3601
… …
3283rouse_wait (...) 3625rouse_wait (...)
3284 PROTOTYPE: ;$ 3626 PROTOTYPE: ;$
3285 PPCODE: 3627 PPCODE:
3286 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3628 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3287 3629
3630void
3631on_enter (SV *block)
3632 ALIAS:
3633 on_leave = 1
3634 PROTOTYPE: &
3635 CODE:
3636{
3637 struct coro *coro = SvSTATE_current;
3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3639
3640 block = s_get_cv_croak (block);
3641
3642 if (!*avp)
3643 *avp = newAV ();
3644
3645 av_push (*avp, SvREFCNT_inc (block));
3646
3647 if (!ix)
3648 on_enterleave_call (aTHX_ block);
3649
3650 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3651 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3652 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3653}
3654
3288 3655
3289MODULE = Coro::State PACKAGE = PerlIO::cede 3656MODULE = Coro::State PACKAGE = PerlIO::cede
3290 3657
3291BOOT: 3658BOOT:
3292 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3659 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3295MODULE = Coro::State PACKAGE = Coro::Semaphore 3662MODULE = Coro::State PACKAGE = Coro::Semaphore
3296 3663
3297SV * 3664SV *
3298new (SV *klass, SV *count = 0) 3665new (SV *klass, SV *count = 0)
3299 CODE: 3666 CODE:
3667{
3668 int semcnt = 1;
3669
3670 if (count)
3671 {
3672 SvGETMAGIC (count);
3673
3674 if (SvOK (count))
3675 semcnt = SvIV (count);
3676 }
3677
3300 RETVAL = sv_bless ( 3678 RETVAL = sv_bless (
3301 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3679 coro_waitarray_new (aTHX_ semcnt),
3302 GvSTASH (CvGV (cv)) 3680 GvSTASH (CvGV (cv))
3303 ); 3681 );
3682}
3304 OUTPUT: 3683 OUTPUT:
3305 RETVAL 3684 RETVAL
3306 3685
3307# helper for Coro::Channel 3686# helper for Coro::Channel and others
3308SV * 3687SV *
3309_alloc (int count) 3688_alloc (int count)
3310 CODE: 3689 CODE:
3311 RETVAL = coro_waitarray_new (aTHX_ count); 3690 RETVAL = coro_waitarray_new (aTHX_ count);
3312 OUTPUT: 3691 OUTPUT:
… …
3370 for (i = 1; i <= wcount; ++i) 3749 for (i = 1; i <= wcount; ++i)
3371 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3750 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3372 } 3751 }
3373} 3752}
3374 3753
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755
3756void
3757_may_delete (SV *sem, int count, int extra_refs)
3758 PPCODE:
3759{
3760 AV *av = (AV *)SvRV (sem);
3761
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES;
3766
3767 XSRETURN_NO;
3768}
3769
3375MODULE = Coro::State PACKAGE = Coro::Signal 3770MODULE = Coro::State PACKAGE = Coro::Signal
3376 3771
3377SV * 3772SV *
3378new (SV *klass) 3773new (SV *klass)
3379 CODE: 3774 CODE:
… …
3450 3845
3451void 3846void
3452_register (char *target, char *proto, SV *req) 3847_register (char *target, char *proto, SV *req)
3453 CODE: 3848 CODE:
3454{ 3849{
3455 CV *req_cv = coro_sv_2cv (aTHX_ req); 3850 SV *req_cv = s_get_cv_croak (req);
3456 /* newXSproto doesn't return the CV on 5.8 */ 3851 /* newXSproto doesn't return the CV on 5.8 */
3457 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3852 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3458 sv_setpv ((SV *)slf_cv, proto); 3853 sv_setpv ((SV *)slf_cv, proto);
3459 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3854 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3460} 3855}
3461 3856
3857MODULE = Coro::State PACKAGE = Coro::Select
3858
3859void
3860patch_pp_sselect ()
3861 CODE:
3862 if (!coro_old_pp_sselect)
3863 {
3864 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3865 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3866 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3867 }
3868
3869void
3870unpatch_pp_sselect ()
3871 CODE:
3872 if (coro_old_pp_sselect)
3873 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0;
3876 }
3877
3878

Diff Legend

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