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.318 by root, Thu Nov 20 07:02:43 2008 UTC vs.
Revision 1.379 by root, Tue Jul 27 14:50:17 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
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
114#endif 64#endif
115 65
116#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
130#else 80#else
131# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
133#endif 83#endif
134 84
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
136 86
137#if __GNUC__ >= 3 87#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 90# define INLINE static inline
141#else 91#else
142# define attribute(x) 92# define attribute(x)
143# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
144# define INLINE static 94# define INLINE static
… …
156# if CORO_PTHREAD 106# if CORO_PTHREAD
157static void *coro_thx; 107static void *coro_thx;
158# endif 108# endif
159#endif 109#endif
160 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
161static 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]);
162 123
163/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
166 127
… …
172static HV *coro_state_stash, *coro_stash; 133static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 134static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 135
175static AV *av_destroy; /* destruction queue */ 136static AV *av_destroy; /* destruction queue */
176static SV *sv_manager; /* the manager coro */ 137static SV *sv_manager; /* the manager coro */
138static SV *sv_idle; /* $Coro::idle */
177 139
178static GV *irsgv; /* $/ */ 140static GV *irsgv; /* $/ */
179static GV *stdoutgv; /* *STDOUT */ 141static GV *stdoutgv; /* *STDOUT */
180static SV *rv_diehook; 142static SV *rv_diehook;
181static SV *rv_warnhook; 143static SV *rv_warnhook;
… …
186static SV *sv_pool_size; 148static SV *sv_pool_size;
187static SV *sv_async_pool_idle; /* description string */ 149static SV *sv_async_pool_idle; /* description string */
188static AV *av_async_pool; /* idle pool */ 150static AV *av_async_pool; /* idle pool */
189static SV *sv_Coro; /* class string */ 151static SV *sv_Coro; /* class string */
190static CV *cv_pool_handler; 152static CV *cv_pool_handler;
191static CV *cv_coro_state_new;
192 153
193/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
194static 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;
195 162
196static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
197static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
198 165
199enum { 166enum {
… …
225 int valgrind_id; 192 int valgrind_id;
226#endif 193#endif
227 unsigned char flags; 194 unsigned char flags;
228} coro_cctx; 195} coro_cctx;
229 196
197coro_cctx *cctx_current; /* the currently running cctx */
198
199/*****************************************************************************/
200
230enum { 201enum {
231 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
232 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
233 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
234 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 */
235}; 207};
236 208
237/* 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 */
238typedef struct 210typedef struct
239{ 211{
240 SV *defsv; 212 SV *defsv;
241 AV *defav; 213 AV *defav;
242 SV *errsv; 214 SV *errsv;
243 SV *irsgv; 215 SV *irsgv;
216 HV *hinthv;
244#define VAR(name,type) type name; 217#define VAR(name,type) type name;
245# include "state.h" 218# include "state.h"
246#undef VAR 219#undef VAR
247} perl_slots; 220} perl_slots;
248 221
… …
250 223
251/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
252struct coro { 225struct coro {
253 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
254 coro_cctx *cctx; 227 coro_cctx *cctx;
228
229 /* ready queue */
230 struct coro *next_ready;
255 231
256 /* state data */ 232 /* state data */
257 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
258 AV *mainstack; 234 AV *mainstack;
259 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
… …
276 /* async_pool */ 252 /* async_pool */
277 SV *saved_deffh; 253 SV *saved_deffh;
278 SV *invoke_cb; 254 SV *invoke_cb;
279 AV *invoke_av; 255 AV *invoke_av;
280 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
281 /* linked list */ 267 /* linked list */
282 struct coro *next, *prev; 268 struct coro *next, *prev;
283}; 269};
284 270
285typedef struct coro *Coro__State; 271typedef struct coro *Coro__State;
… …
290/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
291static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
292 278
293/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
294 280
295#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
296#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
297#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
298#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
299#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
300#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
301 287
302/* for Coro.pm */ 288/* for Coro.pm */
303static SV *coro_current; 289static SV *coro_current;
304static SV *coro_readyhook; 290static SV *coro_readyhook;
305static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
306static CV *cv_coro_run, *cv_coro_terminate; 292static CV *cv_coro_run, *cv_coro_terminate;
307static struct coro *coro_first; 293static struct coro *coro_first;
308#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}
309 315
310/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
311 317
312static SV * 318static SV *
313coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
337 get_hv (name, create); 343 get_hv (name, create);
338#endif 344#endif
339 return get_hv (name, create); 345 return get_hv (name, create);
340} 346}
341 347
342/* may croak */ 348INLINE void
343INLINE CV * 349coro_times_update ()
344coro_sv_2cv (pTHX_ SV *sv)
345{ 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{
346 HV *st; 417 HV *stash;
347 GV *gvp; 418 MAGIC *mg;
348 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;
349} 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 */
350 446
351static AV * 447static AV *
352coro_clone_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
353{ 449{
354 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
355 AV *newpadlist, *newpad; 451 AV *newpadlist, *newpad;
356 452
357 newpadlist = newAV (); 453 newpadlist = newAV ();
… …
362 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
363#endif 459#endif
364 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
365 --AvFILLp (padlist); 461 --AvFILLp (padlist);
366 462
367 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
368 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
369 465
370 return newpadlist; 466 return newpadlist;
371} 467}
372 468
373static void 469static void
374free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
375{ 471{
376 /* may be during global destruction */ 472 /* may be during global destruction */
377 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
378 { 474 {
379 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
380 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
381 { 478 {
382 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
383 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
384 { 481 I32 j = AvFILLp (av);
385 SV *sv; 482
386 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
387 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
388
389 SvREFCNT_dec (*svp);
390 }
391 } 488 }
392 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
393 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
394 } 494 }
395} 495}
396 496
397static int 497static int
398coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
399{ 499{
400 AV *padlist; 500 AV *padlist;
401 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;
402 506
403 /* casting is fun. */ 507 /* casting is fun. */
404 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
405 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
406 510
407 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
408 512
409 return 0; 513 return 0;
410} 514}
411
412#define CORO_MAGIC_type_cv 26
413#define CORO_MAGIC_type_state PERL_MAGIC_ext
414 515
415static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
416 0, 0, 0, 0, 517 0, 0, 0, 0,
417 coro_cv_free 518 coro_cv_free
418}; 519};
419
420#define CORO_MAGIC_NN(sv, type) \
421 (expect_true (SvMAGIC (sv)->mg_type == type) \
422 ? SvMAGIC (sv) \
423 : mg_find (sv, type))
424
425#define CORO_MAGIC(sv, type) \
426 (expect_true (SvMAGIC (sv)) \
427 ? CORO_MAGIC_NN (sv, type) \
428 : 0)
429
430#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
431#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
432
433INLINE struct coro *
434SvSTATE_ (pTHX_ SV *coro)
435{
436 HV *stash;
437 MAGIC *mg;
438
439 if (SvROK (coro))
440 coro = SvRV (coro);
441
442 if (expect_false (SvTYPE (coro) != SVt_PVHV))
443 croak ("Coro::State object required");
444
445 stash = SvSTASH (coro);
446 if (expect_false (stash != coro_stash && stash != coro_state_stash))
447 {
448 /* very slow, but rare, check */
449 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
450 croak ("Coro::State object required");
451 }
452
453 mg = CORO_MAGIC_state (coro);
454 return (struct coro *)mg->mg_ptr;
455}
456
457#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
458
459/* faster than SvSTATE, but expects a coroutine hv */
460#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
461#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
462 520
463/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
464static void 522static void
465get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
466{ 524{
… …
477 CV *cp = Perl_cv_clone (aTHX_ cv); 535 CV *cp = Perl_cv_clone (aTHX_ cv);
478 CvPADLIST (cv) = CvPADLIST (cp); 536 CvPADLIST (cv) = CvPADLIST (cp);
479 CvPADLIST (cp) = 0; 537 CvPADLIST (cp) = 0;
480 SvREFCNT_dec (cp); 538 SvREFCNT_dec (cp);
481#else 539#else
482 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
483#endif 541#endif
484 } 542 }
485} 543}
486 544
487static void 545static void
… …
494 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);
495 553
496 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
497 555
498 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
499 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
500 558
501 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
502} 560}
503 561
504/** 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);
505 617
506static void 618static void
507load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
508{ 620{
509 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
510 c->slot = 0; 622 c->slot = 0;
511 623
512 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
513 625
514 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
515 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
516 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
517 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
518 631
519 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
520 # include "state.h" 633 # include "state.h"
521 #undef VAR 634 #undef VAR
522 635
… …
536 PUTBACK; 649 PUTBACK;
537 } 650 }
538 651
539 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
540 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);
541} 672}
542 673
543static void 674static void
544save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
545{ 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
546 c->except = CORO_THROW; 695 c->except = CORO_THROW;
547 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
548 697
549 { 698 {
550 dSP; 699 dSP;
… …
563 { 712 {
564 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
565 { 714 {
566 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
567 716
568 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))
569 { 718 {
570 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
571 720
572 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
573 { 722 {
… …
597 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
598 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
599 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
600 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
601 { 750 {
602 int i; 751 unsigned int i;
603 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
604 CXINC; 753 CXINC;
605 } 754 }
606 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
607 756
608 c->mainstack = PL_mainstack; 757 c->mainstack = PL_mainstack;
609 758
610 { 759 {
611 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
612 761
613 slot->defav = GvAV (PL_defgv); 762 slot->defav = GvAV (PL_defgv);
614 slot->defsv = DEFSV; 763 slot->defsv = DEFSV;
615 slot->errsv = ERRSV; 764 slot->errsv = ERRSV;
616 slot->irsgv = GvSV (irsgv); 765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
617 767
618 #define VAR(name,type) slot->name = PL_ ## name; 768 #define VAR(name,type) slot->name = PL_ ## name;
619 # include "state.h" 769 # include "state.h"
620 #undef VAR 770 #undef VAR
621 } 771 }
… …
748#endif 898#endif
749 899
750/* 900/*
751 * This overrides the default magic get method of %SIG elements. 901 * This overrides the default magic get method of %SIG elements.
752 * 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
753 * 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
754 * readback here. 904 * readback here.
755 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
756 * not expecting this to actually change the hook. This is a potential problem
757 * when a schedule happens then, but we ignore this.
758 */ 905 */
759static int 906static int
760coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
761{ 908{
762 const char *s = MgPV_nolen_const (mg); 909 const char *s = MgPV_nolen_const (mg);
… …
815 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
816 963
817 if (svp) 964 if (svp)
818 { 965 {
819 SV *old = *svp; 966 SV *old = *svp;
820 *svp = newSVsv (sv); 967 *svp = SvOK (sv) ? newSVsv (sv) : 0;
821 SvREFCNT_dec (old); 968 SvREFCNT_dec (old);
822 return 0; 969 return 0;
823 } 970 }
824 } 971 }
825 972
… …
843slf_check_repeat (pTHX_ struct CoroSLF *frame) 990slf_check_repeat (pTHX_ struct CoroSLF *frame)
844{ 991{
845 return 1; 992 return 1;
846} 993}
847 994
848static UNOP coro_setup_op; 995static UNOP init_perl_op;
849 996
850static 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 */
851coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
852{ 999{
853 /* 1000 /*
854 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
855 */ 1002 */
856 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
857 1004
858 PL_runops = RUNOPS_DEFAULT; 1005 PL_runops = RUNOPS_DEFAULT;
859 PL_curcop = &PL_compiling; 1006 PL_curcop = &PL_compiling;
860 PL_in_eval = EVAL_NULL; 1007 PL_in_eval = EVAL_NULL;
861 PL_comppad = 0; 1008 PL_comppad = 0;
1009 PL_comppad_name = 0;
1010 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0;
862 PL_curpm = 0; 1012 PL_curpm = 0;
863 PL_curpad = 0; 1013 PL_curpad = 0;
864 PL_localizing = 0; 1014 PL_localizing = 0;
865 PL_dirty = 0; 1015 PL_dirty = 0;
866 PL_restartop = 0; 1016 PL_restartop = 0;
867#if PERL_VERSION_ATLEAST (5,10,0) 1017#if PERL_VERSION_ATLEAST (5,10,0)
868 PL_parser = 0; 1018 PL_parser = 0;
869#endif 1019#endif
1020 PL_hints = 0;
870 1021
871 /* recreate the die/warn hooks */ 1022 /* recreate the die/warn hooks */
872 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 );
873 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);
874 1025
875 GvSV (PL_defgv) = newSV (0); 1026 GvSV (PL_defgv) = newSV (0);
876 GvAV (PL_defgv) = coro->args; coro->args = 0; 1027 GvAV (PL_defgv) = coro->args; coro->args = 0;
877 GvSV (PL_errgv) = newSV (0); 1028 GvSV (PL_errgv) = newSV (0);
878 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;
879 PL_rs = newSVsv (GvSV (irsgv)); 1031 PL_rs = newSVsv (GvSV (irsgv));
880 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
881 1033
882 { 1034 {
883 dSP; 1035 dSP;
… …
900 */ 1052 */
901 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 */
902 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 */
903 1055
904 /* 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 */
905 coro_setup_op.op_next = PL_op; 1057 init_perl_op.op_next = PL_op;
906 coro_setup_op.op_type = OP_CUSTOM; 1058 init_perl_op.op_type = OP_ENTERSUB;
907 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
908 /* 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 */
909 1061
910 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
911 1063
912 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
913 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
914}
915 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
916static void 1076static void
917coro_destruct (pTHX_ struct coro *coro) 1077coro_unwind_stacks (pTHX)
918{ 1078{
919 if (!IN_DESTRUCT) 1079 if (!IN_DESTRUCT)
920 { 1080 {
921 /* restore all saved variables and stuff */ 1081 /* restore all saved variables and stuff */
922 LEAVE_SCOPE (0); 1082 LEAVE_SCOPE (0);
… …
930 POPSTACK_TO (PL_mainstack); 1090 POPSTACK_TO (PL_mainstack);
931 1091
932 /* unwind main stack */ 1092 /* unwind main stack */
933 dounwind (-1); 1093 dounwind (-1);
934 } 1094 }
1095}
935 1096
936 SvREFCNT_dec (GvSV (PL_defgv)); 1097static void
937 SvREFCNT_dec (GvAV (PL_defgv)); 1098destroy_perl (pTHX_ struct coro *coro)
938 SvREFCNT_dec (GvSV (PL_errgv)); 1099{
939 SvREFCNT_dec (PL_defoutgv); 1100 SV *svf [9];
940 SvREFCNT_dec (PL_rs);
941 SvREFCNT_dec (GvSV (irsgv));
942 1101
943 SvREFCNT_dec (PL_diehook);
944 SvREFCNT_dec (PL_warnhook);
945 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
946 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
947 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
948 SvREFCNT_dec (coro->invoke_cb); 1139 SvREFCNT_dec (coro->invoke_cb);
949 SvREFCNT_dec (coro->invoke_av); 1140 SvREFCNT_dec (coro->invoke_av);
950 1141 }
951 coro_destruct_stacks (aTHX);
952} 1142}
953 1143
954INLINE void 1144INLINE void
955free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
956{ 1146{
… …
964static int 1154static int
965runops_trace (pTHX) 1155runops_trace (pTHX)
966{ 1156{
967 COP *oldcop = 0; 1157 COP *oldcop = 0;
968 int oldcxix = -2; 1158 int oldcxix = -2;
969 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
970 coro_cctx *cctx = coro->cctx;
971 1159
972 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
973 { 1161 {
974 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
975 1163
976 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
977 { 1165 {
978 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)
979 { 1167 {
980 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
981 SV **bot, **top; 1169 SV **bot, **top;
982 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
983 SV **cb; 1171 SV **cb;
… …
1020 1208
1021 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
1022 { 1210 {
1023 SV **cb; 1211 SV **cb;
1024 1212
1025 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1026 { 1214 {
1027 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1028 1216
1029 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1030 { 1218 {
1031 runops_proc_t old_runops = PL_runops;
1032 dSP; 1219 dSP;
1033 GV *gv = CvGV (cx->blk_sub.cv); 1220 GV *gv = CvGV (cx->blk_sub.cv);
1034 SV *fullname = sv_2mortal (newSV (0)); 1221 SV *fullname = sv_2mortal (newSV (0));
1035 1222
1036 if (isGV (gv)) 1223 if (isGV (gv))
… …
1054 } 1241 }
1055 1242
1056 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1057 } 1244 }
1058 1245
1059 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1060 { 1247 {
1061 dSP; 1248 dSP;
1062 1249
1063 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1064 ENTER; 1251 ENTER;
… …
1083 1270
1084 TAINT_NOT; 1271 TAINT_NOT;
1085 return 0; 1272 return 0;
1086} 1273}
1087 1274
1088static struct coro_cctx *cctx_ssl_cctx;
1089static struct CoroSLF cctx_ssl_frame; 1275static struct CoroSLF cctx_ssl_frame;
1090 1276
1091static void 1277static void
1092slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1278slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1093{ 1279{
1094 ta->prev = (struct coro *)cctx_ssl_cctx;
1095 ta->next = 0; 1280 ta->prev = 0;
1096} 1281}
1097 1282
1098static int 1283static int
1099slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1284slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1100{ 1285{
… …
1103 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1104} 1289}
1105 1290
1106/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1107static void NOINLINE 1292static void NOINLINE
1108cctx_prepare (pTHX_ coro_cctx *cctx) 1293cctx_prepare (pTHX)
1109{ 1294{
1110 PL_top_env = &PL_start_env; 1295 PL_top_env = &PL_start_env;
1111 1296
1112 if (cctx->flags & CC_TRACE) 1297 if (cctx_current->flags & CC_TRACE)
1113 PL_runops = runops_trace; 1298 PL_runops = runops_trace;
1114 1299
1115 /* we already must be executing an SLF op, there is no other valid way 1300 /* we already must be executing an SLF op, there is no other valid way
1116 * that can lead to creation of a new cctx */ 1301 * that can lead to creation of a new cctx */
1117 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1302 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1118 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1303 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1119 1304
1120 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1305 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1121 cctx_ssl_cctx = cctx;
1122 cctx_ssl_frame = slf_frame; 1306 cctx_ssl_frame = slf_frame;
1123 1307
1124 slf_frame.prepare = slf_prepare_set_stacklevel; 1308 slf_frame.prepare = slf_prepare_set_stacklevel;
1125 slf_frame.check = slf_check_set_stacklevel; 1309 slf_frame.check = slf_check_set_stacklevel;
1126} 1310}
… …
1149 /* normally we would need to skip the entersub here */ 1333 /* normally we would need to skip the entersub here */
1150 /* not doing so will re-execute it, which is exactly what we want */ 1334 /* not doing so will re-execute it, which is exactly what we want */
1151 /* PL_nop = PL_nop->op_next */ 1335 /* PL_nop = PL_nop->op_next */
1152 1336
1153 /* inject a fake subroutine call to cctx_init */ 1337 /* inject a fake subroutine call to cctx_init */
1154 cctx_prepare (aTHX_ (coro_cctx *)arg); 1338 cctx_prepare (aTHX);
1155 1339
1156 /* cctx_run is the alternative tail of transfer() */ 1340 /* cctx_run is the alternative tail of transfer() */
1157 transfer_tail (aTHX); 1341 transfer_tail (aTHX);
1158 1342
1159 /* 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 */
1160 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1161 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1162 /* 1346 /*
1163 * 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
1164 * 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.
1165 */ 1350 */
1166 1351
1167 /* 1352 /*
1168 * 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
1169 * 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)
1170 * 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
1171 * bootstrap-time "top" top_env, as we cannot restore the "main" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1172 * 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.
1173 */ 1360 */
1174 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1175 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 */
1176 } 1363 }
1177} 1364}
… …
1254cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1255{ 1442{
1256 if (!cctx) 1443 if (!cctx)
1257 return; 1444 return;
1258 1445
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1447
1259 --cctx_count; 1448 --cctx_count;
1260 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1261 1450
1262 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1263 if (cctx->sptr) 1452 if (cctx->sptr)
… …
1326 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1327 1516
1328 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1329 { 1518 {
1330 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1331 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,");
1332 1521
1333 if (expect_false (next->flags & CF_RUNNING))
1334 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1335
1336 if (expect_false (next->flags & CF_DESTROYED)) 1522 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1337 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,");
1338 1524
1339#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1340 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1341 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,");
1342#endif 1528#endif
… …
1348transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1349{ 1535{
1350 dSTACKLEVEL; 1536 dSTACKLEVEL;
1351 1537
1352 /* sometimes transfer is only called to set idle_sp */ 1538 /* sometimes transfer is only called to set idle_sp */
1353 if (expect_false (!next)) 1539 if (expect_false (!prev))
1354 { 1540 {
1355 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1541 cctx_current->idle_sp = STACKLEVEL;
1356 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1357 } 1543 }
1358 else if (expect_true (prev != next)) 1544 else if (expect_true (prev != next))
1359 { 1545 {
1360 coro_cctx *prev__cctx; 1546 coro_cctx *cctx_prev;
1361 1547
1362 if (expect_false (prev->flags & CF_NEW)) 1548 if (expect_false (prev->flags & CF_NEW))
1363 { 1549 {
1364 /* create a new empty/source context */ 1550 /* create a new empty/source context */
1365 prev->cctx = cctx_new_empty ();
1366 prev->flags &= ~CF_NEW; 1551 prev->flags &= ~CF_NEW;
1367 prev->flags |= CF_RUNNING; 1552 prev->flags |= CF_RUNNING;
1368 } 1553 }
1369 1554
1370 prev->flags &= ~CF_RUNNING; 1555 prev->flags &= ~CF_RUNNING;
… …
1376 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1377 { 1562 {
1378 /* need to start coroutine */ 1563 /* need to start coroutine */
1379 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1380 /* setup coroutine call */ 1565 /* setup coroutine call */
1381 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1382 } 1567 }
1383 else 1568 else
1384 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1385 1570
1386 prev__cctx = prev->cctx;
1387
1388 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1389 if (expect_true ( 1572 if (expect_true (
1390 prev__cctx->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1391 && !(prev__cctx->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1392 && !force_cctx 1575 && !force_cctx
1393 )) 1576 ))
1394 { 1577 {
1395 /* 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 */
1396 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1397 1580
1398 prev->cctx = 0;
1399
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 (prev__cctx))) 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 (prev__cctx); 1587 cctx_put (cctx_current);
1407 } 1588 }
1589 else
1590 prev->cctx = cctx_current;
1408 1591
1409 ++next->usecount; 1592 ++next->usecount;
1410 1593
1411 if (expect_true (!next->cctx)) 1594 cctx_prev = cctx_current;
1412 next->cctx = cctx_get (aTHX); 1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1413 1596
1414 if (expect_false (prev__cctx != next->cctx)) 1597 next->cctx = 0;
1598
1599 if (expect_false (cctx_prev != cctx_current))
1415 { 1600 {
1416 prev__cctx->top_env = PL_top_env; 1601 cctx_prev->top_env = PL_top_env;
1417 PL_top_env = next->cctx->top_env; 1602 PL_top_env = cctx_current->top_env;
1418 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1419 } 1604 }
1420 1605
1421 transfer_tail (aTHX); 1606 transfer_tail (aTHX);
1422 } 1607 }
1423} 1608}
… …
1431coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1432{ 1617{
1433 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1434 return 0; 1619 return 0;
1435 1620
1436 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1437 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1438 1623
1439 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1440 1625
1441 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
… …
1445 --coro_nready; 1630 --coro_nready;
1446 } 1631 }
1447 else 1632 else
1448 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 */
1449 1634
1450 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1451 { 1636 && coro->mainstack != main_mainstack
1452 struct coro temp; 1637 && coro->slot
1453 1638 && !PL_dirty)
1454 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1455
1456 save_perl (aTHX_ &temp);
1457 load_perl (aTHX_ coro); 1639 destroy_perl (aTHX_ coro);
1458 1640
1459 coro_destruct (aTHX_ coro); 1641 if (coro->next) coro->next->prev = coro->prev;
1460 1642 if (coro->prev) coro->prev->next = coro->next;
1461 load_perl (aTHX_ &temp); 1643 if (coro == coro_first) coro_first = coro->next;
1462
1463 coro->slot = 0;
1464 }
1465 1644
1466 cctx_destroy (coro->cctx); 1645 cctx_destroy (coro->cctx);
1467 SvREFCNT_dec (coro->startcv); 1646 SvREFCNT_dec (coro->startcv);
1468 SvREFCNT_dec (coro->args); 1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1469 SvREFCNT_dec (CORO_THROW); 1649 SvREFCNT_dec (CORO_THROW);
1470
1471 if (coro->next) coro->next->prev = coro->prev;
1472 if (coro->prev) coro->prev->next = coro->next;
1473 if (coro == coro_first) coro_first = coro->next;
1474 1650
1475 return 1; 1651 return 1;
1476} 1652}
1477 1653
1478static int 1654static int
… …
1528 1704
1529 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1530 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1531} 1707}
1532 1708
1533/*****************************************************************************/
1534/* gensub: simple closure generation utility */
1535
1536#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1537
1538/* create a closure from XS, returns a code reference */
1539/* the arg can be accessed via GENSUB_ARG from the callback */
1540/* the callback must use dXSARGS/XSRETURN */
1541static SV *
1542gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1543{
1544 CV *cv = (CV *)newSV (0);
1545
1546 sv_upgrade ((SV *)cv, SVt_PVCV);
1547
1548 CvANON_on (cv);
1549 CvISXSUB_on (cv);
1550 CvXSUB (cv) = xsub;
1551 GENSUB_ARG = arg;
1552
1553 return newRV_noinc ((SV *)cv);
1554}
1555
1556/** Coro ********************************************************************/ 1709/** Coro ********************************************************************/
1557 1710
1558INLINE void 1711INLINE void
1559coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1560{ 1713{
1561 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1562}
1563 1715
1564INLINE 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 *
1565coro_deq (pTHX) 1724coro_deq (pTHX)
1566{ 1725{
1567 int prio; 1726 int prio;
1568 1727
1569 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1570 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1571 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 }
1572 1739
1573 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;
1574} 1758}
1575 1759
1576static int 1760static int
1577api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1578{ 1762{
1579 struct coro *coro;
1580 SV *sv_hook;
1581 void (*xs_hook)(void);
1582
1583 if (SvROK (coro_sv))
1584 coro_sv = SvRV (coro_sv);
1585
1586 coro = SvSTATE (coro_sv); 1763 struct coro *coro = SvSTATE (coro_sv);
1587 1764
1588 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1589 return 0; 1766 return 0;
1590 1767
1591 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1592 1769
1593 sv_hook = coro_nready ? 0 : coro_readyhook;
1594 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1595
1596 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1597 ++coro_nready;
1598 1771
1599 if (sv_hook) 1772 if (!coro_nready++)
1600 { 1773 if (coroapi.readyhook)
1601 dSP; 1774 coroapi.readyhook ();
1602
1603 ENTER;
1604 SAVETMPS;
1605
1606 PUSHMARK (SP);
1607 PUTBACK;
1608 call_sv (sv_hook, G_VOID | G_DISCARD);
1609
1610 FREETMPS;
1611 LEAVE;
1612 }
1613
1614 if (xs_hook)
1615 xs_hook ();
1616 1775
1617 return 1; 1776 return 1;
1618} 1777}
1619 1778
1620static int 1779static int
… …
1643static void 1802static void
1644prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1645{ 1804{
1646 for (;;) 1805 for (;;)
1647 { 1806 {
1648 SV *next_sv = coro_deq (aTHX); 1807 struct coro *next = coro_deq (aTHX);
1649 1808
1650 if (expect_true (next_sv)) 1809 if (expect_true (next))
1651 { 1810 {
1652 struct coro *next = SvSTATE_hv (next_sv);
1653
1654 /* cannot transfer to destroyed coros, skip and look for next */ 1811 /* cannot transfer to destroyed coros, skip and look for next */
1655 if (expect_false (next->flags & CF_DESTROYED)) 1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1656 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 */
1657 else 1814 else
1658 { 1815 {
1659 next->flags &= ~CF_READY; 1816 next->flags &= ~CF_READY;
1660 --coro_nready; 1817 --coro_nready;
1661 1818
1662 return prepare_schedule_to (aTHX_ ta, next); 1819 prepare_schedule_to (aTHX_ ta, next);
1820 break;
1663 } 1821 }
1664 } 1822 }
1665 else 1823 else
1666 { 1824 {
1667 /* 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*/
1668 dSP; 1839 dSP;
1669 1840
1670 ENTER; 1841 ENTER;
1671 SAVETMPS; 1842 SAVETMPS;
1672 1843
1673 PUSHMARK (SP); 1844 PUSHMARK (SP);
1674 PUTBACK; 1845 PUTBACK;
1675 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1846 call_sv (sv_idle, G_VOID | G_DISCARD);
1676 1847
1677 FREETMPS; 1848 FREETMPS;
1678 LEAVE; 1849 LEAVE;
1850 }
1679 } 1851 }
1680 } 1852 }
1681} 1853}
1682 1854
1683INLINE void 1855INLINE void
… …
1754static void 1926static void
1755api_trace (pTHX_ SV *coro_sv, int flags) 1927api_trace (pTHX_ SV *coro_sv, int flags)
1756{ 1928{
1757 struct coro *coro = SvSTATE (coro_sv); 1929 struct coro *coro = SvSTATE (coro_sv);
1758 1930
1931 if (coro->flags & CF_RUNNING)
1932 croak ("cannot enable tracing on a running coroutine, caught");
1933
1759 if (flags & CC_TRACE) 1934 if (flags & CC_TRACE)
1760 { 1935 {
1761 if (!coro->cctx) 1936 if (!coro->cctx)
1762 coro->cctx = cctx_new_run (); 1937 coro->cctx = cctx_new_run ();
1763 else if (!(coro->cctx->flags & CC_TRACE)) 1938 else if (!(coro->cctx->flags & CC_TRACE))
1764 croak ("cannot enable tracing on coroutine with custom stack,"); 1939 croak ("cannot enable tracing on coroutine with custom stack, caught");
1765 1940
1766 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1941 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1767 } 1942 }
1768 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1943 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1769 { 1944 {
… …
1814{ 1989{
1815 int i; 1990 int i;
1816 HV *hv = (HV *)SvRV (coro_current); 1991 HV *hv = (HV *)SvRV (coro_current);
1817 AV *av = newAV (); 1992 AV *av = newAV ();
1818 1993
1994 /* items are actually not so common, so optimise for this case */
1995 if (items)
1996 {
1819 av_extend (av, items - 1); 1997 av_extend (av, items - 1);
1998
1820 for (i = 0; i < items; ++i) 1999 for (i = 0; i < items; ++i)
1821 av_push (av, SvREFCNT_inc_NN (arg [i])); 2000 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 }
1822 2002
1823 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);
1824 2004
1825 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 */
1826 api_ready (aTHX_ sv_manager); 2006 api_ready (aTHX_ sv_manager);
1827 2007
1828 frame->prepare = prepare_schedule; 2008 frame->prepare = prepare_schedule;
1829 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);*/
1830} 2014}
1831 2015
1832/*****************************************************************************/ 2016/*****************************************************************************/
1833/* async pool handler */ 2017/* async pool handler */
1834 2018
… …
1912 2096
1913static void 2097static void
1914coro_rouse_callback (pTHX_ CV *cv) 2098coro_rouse_callback (pTHX_ CV *cv)
1915{ 2099{
1916 dXSARGS; 2100 dXSARGS;
1917 SV *data = (SV *)GENSUB_ARG; 2101 SV *data = (SV *)S_GENSUB_ARG;
1918 2102
1919 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2103 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1920 { 2104 {
1921 /* first call, set args */ 2105 /* first call, set args */
2106 SV *coro = SvRV (data);
1922 AV *av = newAV (); 2107 AV *av = newAV ();
1923 SV *coro = SvRV (data);
1924 2108
1925 SvRV_set (data, (SV *)av); 2109 SvRV_set (data, (SV *)av);
1926 api_ready (aTHX_ coro);
1927 SvREFCNT_dec (coro);
1928 2110
1929 /* better take a full copy of the arguments */ 2111 /* better take a full copy of the arguments */
1930 while (items--) 2112 while (items--)
1931 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);
1932 } 2117 }
1933 2118
1934 XSRETURN_EMPTY; 2119 XSRETURN_EMPTY;
1935} 2120}
1936 2121
… …
1953 2138
1954 EXTEND (SP, AvFILLp (av) + 1); 2139 EXTEND (SP, AvFILLp (av) + 1);
1955 for (i = 0; i <= AvFILLp (av); ++i) 2140 for (i = 0; i <= AvFILLp (av); ++i)
1956 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2141 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1957 2142
1958 /* 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 */
1959 AvFILLp (av) = -1; 2144 AvFILLp (av) = -1;
1960 av_undef (av); 2145 av_undef (av);
1961 2146
1962 PUTBACK; 2147 PUTBACK;
1963 } 2148 }
… …
1987 || SvTYPE (SvRV (cb)) != SVt_PVCV 2172 || SvTYPE (SvRV (cb)) != SVt_PVCV
1988 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1989 croak ("Coro::rouse_wait called with illegal callback argument,"); 2174 croak ("Coro::rouse_wait called with illegal callback argument,");
1990 2175
1991 { 2176 {
1992 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1993 SV *data = (SV *)GENSUB_ARG; 2178 SV *data = (SV *)S_GENSUB_ARG;
1994 2179
1995 frame->data = (void *)data; 2180 frame->data = (void *)data;
1996 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1997 frame->check = slf_check_rouse_wait; 2182 frame->check = slf_check_rouse_wait;
1998 } 2183 }
… …
2002coro_new_rouse_cb (pTHX) 2187coro_new_rouse_cb (pTHX)
2003{ 2188{
2004 HV *hv = (HV *)SvRV (coro_current); 2189 HV *hv = (HV *)SvRV (coro_current);
2005 struct coro *coro = SvSTATE_hv (hv); 2190 struct coro *coro = SvSTATE_hv (hv);
2006 SV *data = newRV_inc ((SV *)hv); 2191 SV *data = newRV_inc ((SV *)hv);
2007 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2008 2193
2009 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);
2010 SvREFCNT_dec (data); /* magicext increases the refcount */ 2195 SvREFCNT_dec (data); /* magicext increases the refcount */
2011 2196
2012 SvREFCNT_dec (coro->rouse_cb); 2197 SvREFCNT_dec (coro->rouse_cb);
… …
2237 if (PL_op->op_flags & OPf_STACKED) 2422 if (PL_op->op_flags & OPf_STACKED)
2238 { 2423 {
2239 if (items > slf_arga) 2424 if (items > slf_arga)
2240 { 2425 {
2241 slf_arga = items; 2426 slf_arga = items;
2242 free (slf_argv); 2427 Safefree (slf_argv);
2243 slf_argv = malloc (slf_arga * sizeof (SV *)); 2428 New (0, slf_argv, slf_arga, SV *);
2244 } 2429 }
2245 2430
2246 slf_argc = items; 2431 slf_argc = items;
2247 2432
2248 for (i = 0; i < items; ++i) 2433 for (i = 0; i < items; ++i)
… …
2250 } 2435 }
2251 else 2436 else
2252 slf_argc = 0; 2437 slf_argc = 0;
2253 2438
2254 PL_op->op_ppaddr = pp_slf; 2439 PL_op->op_ppaddr = pp_slf;
2255 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2440 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2256 2441
2257 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));
2258} 2490}
2259 2491
2260/*****************************************************************************/ 2492/*****************************************************************************/
2261/* PerlIO::cede */ 2493/* PerlIO::cede */
2262 2494
… …
2336/* Coro::Semaphore & Coro::Signal */ 2568/* Coro::Semaphore & Coro::Signal */
2337 2569
2338static SV * 2570static SV *
2339coro_waitarray_new (pTHX_ int count) 2571coro_waitarray_new (pTHX_ int count)
2340{ 2572{
2341 /* 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 */
2342 AV *av = newAV (); 2574 AV *av = newAV ();
2343 SV **ary; 2575 SV **ary;
2344 2576
2345 /* unfortunately, building manually saves memory */ 2577 /* unfortunately, building manually saves memory */
2346 Newx (ary, 2, SV *); 2578 Newx (ary, 2, SV *);
2347 AvALLOC (av) = ary; 2579 AvALLOC (av) = ary;
2580#if PERL_VERSION_ATLEAST (5,10,0)
2348 /*AvARRAY (av) = ary;*/ 2581 AvARRAY (av) = ary;
2582#else
2349 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
2350 AvMAX (av) = 1; 2587 AvMAX (av) = 1;
2351 AvFILLp (av) = 0; 2588 AvFILLp (av) = 0;
2352 ary [0] = newSViv (count); 2589 ary [0] = newSViv (count);
2353 2590
2354 return newRV_noinc ((SV *)av); 2591 return newRV_noinc ((SV *)av);
… …
2483{ 2720{
2484 if (items >= 2) 2721 if (items >= 2)
2485 { 2722 {
2486 /* callback form */ 2723 /* callback form */
2487 AV *av = (AV *)SvRV (arg [0]); 2724 AV *av = (AV *)SvRV (arg [0]);
2488 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2725 SV *cb_cv = s_get_cv_croak (arg [1]);
2489 2726
2490 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2727 av_push (av, SvREFCNT_inc_NN (cb_cv));
2491 2728
2492 if (SvIVX (AvARRAY (av)[0]) > 0) 2729 if (SvIVX (AvARRAY (av)[0]) > 0)
2493 coro_semaphore_adjust (aTHX_ av, 0); 2730 coro_semaphore_adjust (aTHX_ av, 0);
2494 2731
2495 frame->prepare = prepare_nop; 2732 frame->prepare = prepare_nop;
… …
2519 AvARRAY (av)[0] = AvARRAY (av)[1]; 2756 AvARRAY (av)[0] = AvARRAY (av)[1];
2520 AvARRAY (av)[1] = cb; 2757 AvARRAY (av)[1] = cb;
2521 2758
2522 cb = av_shift (av); 2759 cb = av_shift (av);
2523 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 {
2524 api_ready (aTHX_ cb); 2771 api_ready (aTHX_ cb);
2525 sv_setiv (cb, 0); /* signal waiter */ 2772 sv_setiv (cb, 0); /* signal waiter */
2773 }
2774
2526 SvREFCNT_dec (cb); 2775 SvREFCNT_dec (cb);
2527 2776
2528 --count; 2777 --count;
2529 } 2778 }
2530} 2779}
… …
2539static void 2788static void
2540slf_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)
2541{ 2790{
2542 AV *av = (AV *)SvRV (arg [0]); 2791 AV *av = (AV *)SvRV (arg [0]);
2543 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
2544 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]))
2545 { 2805 {
2546 SvIVX (AvARRAY (av)[0]) = 0; 2806 SvIVX (AvARRAY (av)[0]) = 0;
2547 frame->prepare = prepare_nop; 2807 frame->prepare = prepare_nop;
2548 frame->check = slf_check_nop; 2808 frame->check = slf_check_nop;
2549 } 2809 }
2550 else 2810 else
2551 { 2811 {
2552 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2812 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2553 2813
2554 av_push (av, waiter); 2814 av_push (av, waiter);
2555 2815
2556 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 */
2557 frame->prepare = prepare_schedule; 2817 frame->prepare = prepare_schedule;
… …
2575 2835
2576static void 2836static void
2577coro_aio_callback (pTHX_ CV *cv) 2837coro_aio_callback (pTHX_ CV *cv)
2578{ 2838{
2579 dXSARGS; 2839 dXSARGS;
2580 AV *state = (AV *)GENSUB_ARG; 2840 AV *state = (AV *)S_GENSUB_ARG;
2581 SV *coro = av_pop (state); 2841 SV *coro = av_pop (state);
2582 SV *data_sv = newSV (sizeof (struct io_state)); 2842 SV *data_sv = newSV (sizeof (struct io_state));
2583 2843
2584 av_extend (state, items - 1); 2844 av_extend (state, items - 1);
2585 2845
… …
2699 2959
2700 for (i = 0; i < items; ++i) 2960 for (i = 0; i < items; ++i)
2701 PUSHs (arg [i]); 2961 PUSHs (arg [i]);
2702 2962
2703 /* now push the callback closure */ 2963 /* now push the callback closure */
2704 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))));
2705 2965
2706 /* now call the AIO function - we assume our request is uncancelable */ 2966 /* now call the AIO function - we assume our request is uncancelable */
2707 PUTBACK; 2967 PUTBACK;
2708 call_sv ((SV *)req, G_VOID | G_DISCARD); 2968 call_sv ((SV *)req, G_VOID | G_DISCARD);
2709 } 2969 }
… …
2723 2983
2724 XSRETURN_EMPTY; 2984 XSRETURN_EMPTY;
2725} 2985}
2726 2986
2727/*****************************************************************************/ 2987/*****************************************************************************/
2988
2989#if CORO_CLONE
2990# include "clone.c"
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}
2728 3050
2729MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2730 3052
2731PROTOTYPES: DISABLE 3053PROTOTYPES: DISABLE
2732 3054
… …
2737 coro_thx = PERL_GET_CONTEXT; 3059 coro_thx = PERL_GET_CONTEXT;
2738# endif 3060# endif
2739#endif 3061#endif
2740 BOOT_PAGESIZE; 3062 BOOT_PAGESIZE;
2741 3063
3064 cctx_current = cctx_new_empty ();
3065
2742 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2743 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2744 3068
2745 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3069 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2746 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3070 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2765 3089
2766 { 3090 {
2767 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3091 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2768 3092
2769 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3093 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2770 hv_store_ent (PL_custom_op_names, slf, 3094 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2771 newSVpv ("coro_slf", 0), 0);
2772 3095
2773 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3096 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2774 hv_store_ent (PL_custom_op_descs, slf, 3097 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2775 newSVpv ("coro schedule like function", 0), 0);
2776 } 3098 }
2777 3099
2778 coroapi.ver = CORO_API_VERSION; 3100 coroapi.ver = CORO_API_VERSION;
2779 coroapi.rev = CORO_API_REVISION; 3101 coroapi.rev = CORO_API_REVISION;
2780 3102
… …
2792 3114
2793 if (!svp) croak ("Time::HiRes is required"); 3115 if (!svp) croak ("Time::HiRes is required");
2794 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2795 3117
2796 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));
2797 } 3122 }
2798 3123
2799 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2800} 3125}
2801 3126
2802SV * 3127SV *
2803new (char *klass, ...) 3128new (SV *klass, ...)
2804 ALIAS: 3129 ALIAS:
2805 Coro::new = 1 3130 Coro::new = 1
2806 CODE: 3131 CODE:
2807{ 3132 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2808 struct coro *coro; 3133 OUTPUT:
2809 MAGIC *mg;
2810 HV *hv;
2811 CV *cb;
2812 int i;
2813
2814 if (items > 1)
2815 {
2816 cb = coro_sv_2cv (aTHX_ ST (1));
2817
2818 if (!ix)
2819 {
2820 if (CvISXSUB (cb))
2821 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2822
2823 if (!CvROOT (cb))
2824 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2825 }
2826 }
2827
2828 Newz (0, coro, 1, struct coro);
2829 coro->args = newAV ();
2830 coro->flags = CF_NEW;
2831
2832 if (coro_first) coro_first->prev = coro;
2833 coro->next = coro_first;
2834 coro_first = coro;
2835
2836 coro->hv = hv = newHV ();
2837 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2838 mg->mg_flags |= MGf_DUP;
2839 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2840
2841 if (items > 1)
2842 {
2843 av_extend (coro->args, items - 1 + ix - 1);
2844
2845 if (ix)
2846 {
2847 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2848 cb = cv_coro_run;
2849 }
2850
2851 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2852
2853 for (i = 2; i < items; i++)
2854 av_push (coro->args, newSVsv (ST (i)));
2855 }
2856}
2857 OUTPUT:
2858 RETVAL 3134 RETVAL
2859 3135
2860void 3136void
2861transfer (...) 3137transfer (...)
2862 PROTOTYPE: $$ 3138 PROTOTYPE: $$
… …
2873void 3149void
2874_exit (int code) 3150_exit (int code)
2875 PROTOTYPE: $ 3151 PROTOTYPE: $
2876 CODE: 3152 CODE:
2877 _exit (code); 3153 _exit (code);
3154
3155SV *
3156clone (Coro::State coro)
3157 CODE:
3158{
3159#if CORO_CLONE
3160 struct coro *ncoro = coro_clone (aTHX_ coro);
3161 MAGIC *mg;
3162 /* TODO: too much duplication */
3163 ncoro->hv = newHV ();
3164 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3167#else
3168 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3169#endif
3170}
3171 OUTPUT:
3172 RETVAL
2878 3173
2879int 3174int
2880cctx_stacksize (int new_stacksize = 0) 3175cctx_stacksize (int new_stacksize = 0)
2881 PROTOTYPE: ;$ 3176 PROTOTYPE: ;$
2882 CODE: 3177 CODE:
… …
2932 eval = 1 3227 eval = 1
2933 CODE: 3228 CODE:
2934{ 3229{
2935 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2936 { 3231 {
2937 struct coro temp; 3232 struct coro *current = SvSTATE_current;
2938 3233
2939 if (!(coro->flags & CF_RUNNING)) 3234 if (current != coro)
2940 { 3235 {
2941 PUTBACK; 3236 PUTBACK;
2942 save_perl (aTHX_ &temp); 3237 save_perl (aTHX_ current);
2943 load_perl (aTHX_ coro); 3238 load_perl (aTHX_ coro);
3239 SPAGAIN;
2944 } 3240 }
2945 3241
2946 {
2947 dSP;
2948 ENTER;
2949 SAVETMPS;
2950 PUTBACK;
2951 PUSHSTACK; 3242 PUSHSTACK;
3243
2952 PUSHMARK (SP); 3244 PUSHMARK (SP);
3245 PUTBACK;
2953 3246
2954 if (ix) 3247 if (ix)
2955 eval_sv (coderef, 0); 3248 eval_sv (coderef, 0);
2956 else 3249 else
2957 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3250 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2958 3251
2959 POPSTACK; 3252 POPSTACK;
2960 SPAGAIN; 3253 SPAGAIN;
2961 FREETMPS;
2962 LEAVE;
2963 PUTBACK;
2964 }
2965 3254
2966 if (!(coro->flags & CF_RUNNING)) 3255 if (current != coro)
2967 { 3256 {
3257 PUTBACK;
2968 save_perl (aTHX_ coro); 3258 save_perl (aTHX_ coro);
2969 load_perl (aTHX_ &temp); 3259 load_perl (aTHX_ current);
2970 SPAGAIN; 3260 SPAGAIN;
2971 } 3261 }
2972 } 3262 }
2973} 3263}
2974 3264
… …
2978 ALIAS: 3268 ALIAS:
2979 is_ready = CF_READY 3269 is_ready = CF_READY
2980 is_running = CF_RUNNING 3270 is_running = CF_RUNNING
2981 is_new = CF_NEW 3271 is_new = CF_NEW
2982 is_destroyed = CF_DESTROYED 3272 is_destroyed = CF_DESTROYED
3273 is_suspended = CF_SUSPENDED
2983 CODE: 3274 CODE:
2984 RETVAL = boolSV (coro->flags & ix); 3275 RETVAL = boolSV (coro->flags & ix);
2985 OUTPUT: 3276 OUTPUT:
2986 RETVAL 3277 RETVAL
2987 3278
2988void 3279void
2989throw (Coro::State self, SV *throw = &PL_sv_undef) 3280throw (Coro::State self, SV *exception = &PL_sv_undef)
2990 PROTOTYPE: $;$ 3281 PROTOTYPE: $;$
2991 CODE: 3282 CODE:
2992{ 3283{
2993 struct coro *current = SvSTATE_current; 3284 struct coro *current = SvSTATE_current;
2994 SV **throwp = self == current ? &CORO_THROW : &self->except; 3285 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2995 SvREFCNT_dec (*throwp); 3286 SvREFCNT_dec (*exceptionp);
2996 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3287 SvGETMAGIC (exception);
3288 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2997} 3289}
2998 3290
2999void 3291void
3000api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3001 PROTOTYPE: $;$ 3293 PROTOTYPE: $;$
… …
3003 3295
3004SV * 3296SV *
3005has_cctx (Coro::State coro) 3297has_cctx (Coro::State coro)
3006 PROTOTYPE: $ 3298 PROTOTYPE: $
3007 CODE: 3299 CODE:
3008 RETVAL = boolSV (!!coro->cctx); 3300 /* maybe manage the running flag differently */
3301 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3009 OUTPUT: 3302 OUTPUT:
3010 RETVAL 3303 RETVAL
3011 3304
3012int 3305int
3013is_traced (Coro::State coro) 3306is_traced (Coro::State coro)
… …
3033 3326
3034void 3327void
3035force_cctx () 3328force_cctx ()
3036 PROTOTYPE: 3329 PROTOTYPE:
3037 CODE: 3330 CODE:
3038 SvSTATE_current->cctx->idle_sp = 0; 3331 cctx_current->idle_sp = 0;
3039 3332
3040void 3333void
3041swap_defsv (Coro::State self) 3334swap_defsv (Coro::State self)
3042 PROTOTYPE: $ 3335 PROTOTYPE: $
3043 ALIAS: 3336 ALIAS:
… …
3051 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3344 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3052 3345
3053 SV *tmp = *src; *src = *dst; *dst = tmp; 3346 SV *tmp = *src; *src = *dst; *dst = tmp;
3054 } 3347 }
3055 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
3056 3412
3057MODULE = Coro::State PACKAGE = Coro 3413MODULE = Coro::State PACKAGE = Coro
3058 3414
3059BOOT: 3415BOOT:
3060{ 3416{
3061 int i;
3062
3063 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3064 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3065 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3066 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3067 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);
3068 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3069 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3070 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);
3071 3426
3072 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);
3073 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3074 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);
3075 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 */
3076 3431
3077 coro_stash = gv_stashpv ("Coro", TRUE); 3432 coro_stash = gv_stashpv ("Coro", TRUE);
3078 3433
3079 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3080 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3081 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3082 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3437 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3083 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3438 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3084 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3439 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3085
3086 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3087 coro_ready[i] = newAV ();
3088 3440
3089 { 3441 {
3090 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3442 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3091 3443
3092 coroapi.schedule = api_schedule; 3444 coroapi.schedule = api_schedule;
… …
3102 sv_setiv (sv, (IV)&coroapi); 3454 sv_setiv (sv, (IV)&coroapi);
3103 SvREADONLY_on (sv); 3455 SvREADONLY_on (sv);
3104 } 3456 }
3105} 3457}
3106 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
3107void 3468void
3108terminate (...) 3469terminate (...)
3109 CODE: 3470 CODE:
3110 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3471 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3111 3472
… …
3131 3492
3132void 3493void
3133cede_notself (...) 3494cede_notself (...)
3134 CODE: 3495 CODE:
3135 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3496 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3136
3137void
3138_cancel (Coro::State self)
3139 CODE:
3140 coro_state_destroy (aTHX_ self);
3141 coro_call_on_destroy (aTHX_ self);
3142 3497
3143void 3498void
3144_set_current (SV *current) 3499_set_current (SV *current)
3145 PROTOTYPE: $ 3500 PROTOTYPE: $
3146 CODE: 3501 CODE:
… …
3150void 3505void
3151_set_readyhook (SV *hook) 3506_set_readyhook (SV *hook)
3152 PROTOTYPE: $ 3507 PROTOTYPE: $
3153 CODE: 3508 CODE:
3154 SvREFCNT_dec (coro_readyhook); 3509 SvREFCNT_dec (coro_readyhook);
3510 SvGETMAGIC (hook);
3511 if (SvOK (hook))
3512 {
3155 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 }
3156 3521
3157int 3522int
3158prio (Coro::State coro, int newprio = 0) 3523prio (Coro::State coro, int newprio = 0)
3159 PROTOTYPE: $;$ 3524 PROTOTYPE: $;$
3160 ALIAS: 3525 ALIAS:
… …
3166 if (items > 1) 3531 if (items > 1)
3167 { 3532 {
3168 if (ix) 3533 if (ix)
3169 newprio = coro->prio - newprio; 3534 newprio = coro->prio - newprio;
3170 3535
3171 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3536 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3172 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3537 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3173 3538
3174 coro->prio = newprio; 3539 coro->prio = newprio;
3175 } 3540 }
3176} 3541}
3177 OUTPUT: 3542 OUTPUT:
… …
3192 RETVAL = coro_nready; 3557 RETVAL = coro_nready;
3193 OUTPUT: 3558 OUTPUT:
3194 RETVAL 3559 RETVAL
3195 3560
3196void 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
3197_pool_handler (...) 3574_pool_handler (...)
3198 CODE: 3575 CODE:
3199 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3576 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3200 3577
3201void 3578void
… …
3212 for (i = 1; i < items; ++i) 3589 for (i = 1; i < items; ++i)
3213 av_push (av, SvREFCNT_inc_NN (ST (i))); 3590 av_push (av, SvREFCNT_inc_NN (ST (i)));
3214 3591
3215 if ((SV *)hv == &PL_sv_undef) 3592 if ((SV *)hv == &PL_sv_undef)
3216 { 3593 {
3217 PUSHMARK (SP); 3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3218 EXTEND (SP, 2);
3219 PUSHs (sv_Coro);
3220 PUSHs ((SV *)cv_pool_handler);
3221 PUTBACK;
3222 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3223 SPAGAIN;
3224
3225 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3596 SvREFCNT_dec (sv);
3226 } 3597 }
3227 3598
3228 { 3599 {
3229 struct coro *coro = SvSTATE_hv (hv); 3600 struct coro *coro = SvSTATE_hv (hv);
3230 3601
… …
3254rouse_wait (...) 3625rouse_wait (...)
3255 PROTOTYPE: ;$ 3626 PROTOTYPE: ;$
3256 PPCODE: 3627 PPCODE:
3257 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3628 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3258 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
3259 3655
3260MODULE = Coro::State PACKAGE = PerlIO::cede 3656MODULE = Coro::State PACKAGE = PerlIO::cede
3261 3657
3262BOOT: 3658BOOT:
3263 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3659 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3266MODULE = Coro::State PACKAGE = Coro::Semaphore 3662MODULE = Coro::State PACKAGE = Coro::Semaphore
3267 3663
3268SV * 3664SV *
3269new (SV *klass, SV *count = 0) 3665new (SV *klass, SV *count = 0)
3270 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
3271 RETVAL = sv_bless ( 3678 RETVAL = sv_bless (
3272 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3679 coro_waitarray_new (aTHX_ semcnt),
3273 GvSTASH (CvGV (cv)) 3680 GvSTASH (CvGV (cv))
3274 ); 3681 );
3682}
3275 OUTPUT: 3683 OUTPUT:
3276 RETVAL 3684 RETVAL
3277 3685
3278# helper for Coro::Channel 3686# helper for Coro::Channel and others
3279SV * 3687SV *
3280_alloc (int count) 3688_alloc (int count)
3281 CODE: 3689 CODE:
3282 RETVAL = coro_waitarray_new (aTHX_ count); 3690 RETVAL = coro_waitarray_new (aTHX_ count);
3283 OUTPUT: 3691 OUTPUT:
… …
3341 for (i = 1; i <= wcount; ++i) 3749 for (i = 1; i <= wcount; ++i)
3342 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3750 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3343 } 3751 }
3344} 3752}
3345 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
3346MODULE = Coro::State PACKAGE = Coro::Signal 3770MODULE = Coro::State PACKAGE = Coro::Signal
3347 3771
3348SV * 3772SV *
3349new (SV *klass) 3773new (SV *klass)
3350 CODE: 3774 CODE:
… …
3421 3845
3422void 3846void
3423_register (char *target, char *proto, SV *req) 3847_register (char *target, char *proto, SV *req)
3424 CODE: 3848 CODE:
3425{ 3849{
3426 CV *req_cv = coro_sv_2cv (aTHX_ req); 3850 SV *req_cv = s_get_cv_croak (req);
3427 /* newXSproto doesn't return the CV on 5.8 */ 3851 /* newXSproto doesn't return the CV on 5.8 */
3428 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3852 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3429 sv_setpv ((SV *)slf_cv, proto); 3853 sv_setpv ((SV *)slf_cv, proto);
3430 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);
3431} 3855}
3432 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