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.324 by root, Sat Nov 22 07:02:28 2008 UTC vs.
Revision 1.396 by root, Fri May 6 18:01:13 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
6#include "EXTERN.h" 11#include "EXTERN.h"
7#include "perl.h" 12#include "perl.h"
8#include "XSUB.h" 13#include "XSUB.h"
9#include "perliol.h" 14#include "perliol.h"
10 15
11#include "patchlevel.h" 16#include "schmorp.h"
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
51#endif 61#endif
52 62
53/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
55 65
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 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
117#endif 68#endif
118 69
119#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
133#else 84#else
134# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
136#endif 87#endif
137 88
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
139 90
140#if __GNUC__ >= 3 91#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 94# define INLINE static inline
144#else 95#else
145# define attribute(x) 96# define attribute(x)
146# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
147# define INLINE static 98# define INLINE static
… …
159# if CORO_PTHREAD 110# if CORO_PTHREAD
160static void *coro_thx; 111static void *coro_thx;
161# endif 112# endif
162#endif 113#endif
163 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
164static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
165 127
166/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
169 131
… …
175static HV *coro_state_stash, *coro_stash; 137static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 138static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 139
178static AV *av_destroy; /* destruction queue */ 140static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 141static SV *sv_manager; /* the manager coro */
142static SV *sv_idle; /* $Coro::idle */
180 143
181static GV *irsgv; /* $/ */ 144static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 145static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 146static SV *rv_diehook;
184static SV *rv_warnhook; 147static SV *rv_warnhook;
… …
189static SV *sv_pool_size; 152static SV *sv_pool_size;
190static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
191static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
192static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
193static CV *cv_pool_handler; 156static CV *cv_pool_handler;
194static CV *cv_coro_state_new;
195 157
196/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
197static SV *sv_activity; 159static SV *sv_activity;
160
161/* enable processtime/realtime profiling */
162static char enable_times;
163typedef U32 coro_ts[2];
164static coro_ts time_real, time_cpu;
165static char times_valid;
198 166
199static struct coro_cctx *cctx_first; 167static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 168static int cctx_count, cctx_idle;
201 169
202enum { 170enum {
… …
228 int valgrind_id; 196 int valgrind_id;
229#endif 197#endif
230 unsigned char flags; 198 unsigned char flags;
231} coro_cctx; 199} coro_cctx;
232 200
233coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
234 202
235/*****************************************************************************/ 203/*****************************************************************************/
236 204
237enum { 205enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
241 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
242}; 212};
243 213
244/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
245typedef struct 215typedef struct
246{ 216{
247 SV *defsv; 217 SV *defsv;
248 AV *defav; 218 AV *defav;
249 SV *errsv; 219 SV *errsv;
250 SV *irsgv; 220 SV *irsgv;
221 HV *hinthv;
251#define VAR(name,type) type name; 222#define VAR(name,type) type name;
252# include "state.h" 223# include "state.h"
253#undef VAR 224#undef VAR
254} perl_slots; 225} perl_slots;
255 226
… …
257 228
258/* this is a structure representing a perl-level coroutine */ 229/* this is a structure representing a perl-level coroutine */
259struct coro { 230struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 231 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 232 coro_cctx *cctx;
233
234 /* ready queue */
235 struct coro *next_ready;
262 236
263 /* state data */ 237 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 238 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 239 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 240 perl_slots *slot; /* basically the saved sp */
… …
268 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
269 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
270 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
271 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
272 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
273 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
274 248
275 /* statistics */ 249 /* statistics */
276 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
277 251
278 /* coro process data */ 252 /* coro process data */
… …
283 /* async_pool */ 257 /* async_pool */
284 SV *saved_deffh; 258 SV *saved_deffh;
285 SV *invoke_cb; 259 SV *invoke_cb;
286 AV *invoke_av; 260 AV *invoke_av;
287 261
262 /* on_enter/on_leave */
263 AV *on_enter;
264 AV *on_leave;
265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
288 /* linked list */ 272 /* linked list */
289 struct coro *next, *prev; 273 struct coro *next, *prev;
290}; 274};
291 275
292typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
293typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
294 278
295/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
296/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
297/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
299 283
300/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
301 285
302#define PRIO_MAX 3 286#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 287#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 288#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 289#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 290#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 291#define CORO_PRIO_MIN -4
308 292
309/* for Coro.pm */ 293/* for Coro.pm */
310static SV *coro_current; 294static SV *coro_current;
311static SV *coro_readyhook; 295static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 298static struct coro *coro_first;
315#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
316 372
317/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
318 374
319static SV * 375static SV *
320coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
344 get_hv (name, create); 400 get_hv (name, create);
345#endif 401#endif
346 return get_hv (name, create); 402 return get_hv (name, create);
347} 403}
348 404
349/* may croak */ 405INLINE void
350INLINE CV * 406coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 407{
408#ifdef coro_clock_gettime
409 struct timespec ts;
410
411 ts.tv_sec = ts.tv_nsec = 0;
412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
414
415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
450}
451
452/*****************************************************************************/
453/* magic glue */
454
455#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext
457
458#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \
461 : mg_find (sv, type))
462
463#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \
466 : 0)
467
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470
471INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro)
473{
353 HV *st; 474 HV *stash;
354 GV *gvp; 475 MAGIC *mg;
355 return sv_2cv (sv, &st, &gvp, 0); 476
477 if (SvROK (coro))
478 coro = SvRV (coro);
479
480 if (expect_false (SvTYPE (coro) != SVt_PVHV))
481 croak ("Coro::State object required");
482
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr;
356} 493}
494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496
497/* faster than SvSTATE, but expects a coroutine hv */
498#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500
501/*****************************************************************************/
502/* padlist management and caching */
357 503
358static AV * 504static AV *
359coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
360{ 506{
361 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
… …
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 516#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 518 --AvFILLp (padlist);
373 519
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
376 522
377 return newpadlist; 523 return newpadlist;
378} 524}
379 525
380static void 526static void
381free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
382{ 528{
383 /* may be during global destruction */ 529 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 530 if (!IN_DESTRUCT)
385 { 531 {
386 I32 i = AvFILLp (padlist); 532 I32 i = AvFILLp (padlist);
387 while (i >= 0) 533
534 while (i > 0) /* special-case index 0 */
388 { 535 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 536 /* we try to be extra-careful here */
390 if (svp) 537 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 538 I32 j = AvFILLp (av);
392 SV *sv; 539
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 540 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]);
542
543 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 544 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 545 }
399 546
547 SvREFCNT_dec (AvARRAY (padlist)[0]);
548
549 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 550 SvREFCNT_dec ((SV*)padlist);
401 } 551 }
402} 552}
403 553
404static int 554static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 556{
407 AV *padlist; 557 AV *padlist;
408 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
409 563
410 /* casting is fun. */ 564 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
413 567
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 569
416 return 0; 570 return 0;
417} 571}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 572
422static MGVTBL coro_cv_vtbl = { 573static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 574 0, 0, 0, 0,
424 coro_cv_free 575 coro_cv_free
425}; 576};
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 577
470/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
471static void 579static void
472get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
473{ 581{
… …
501 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
502 610
503 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
504 612
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
507 615
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 617}
510 618
511/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
512 674
513static void 675static void
514load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
515{ 677{
516 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
517 c->slot = 0; 679 c->slot = 0;
518 680
519 PL_mainstack = c->mainstack; 681 PL_mainstack = c->mainstack;
520 682
521 GvSV (PL_defgv) = slot->defsv; 683 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 684 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 685 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
525 688
526 #define VAR(name,type) PL_ ## name = slot->name; 689 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 690 # include "state.h"
528 #undef VAR 691 #undef VAR
529 692
… …
543 PUTBACK; 706 PUTBACK;
544 } 707 }
545 708
546 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
547 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
720 if (expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
548} 729}
549 730
550static void 731static void
551save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
552{ 733{
734 SWAP_SVS (c);
735
736 if (expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
750 }
751
553 c->except = CORO_THROW; 752 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
555 754
556 { 755 {
557 dSP; 756 dSP;
… …
570 { 769 {
571 while (expect_true (cxix >= 0)) 770 while (expect_true (cxix >= 0))
572 { 771 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
574 773
575 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
576 { 775 {
577 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
578 777
579 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
580 { 779 {
… …
604 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
608 { 807 {
609 int i; 808 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 810 CXINC;
612 } 811 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 813
615 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
616 815
617 { 816 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 818
620 slot->defav = GvAV (PL_defgv); 819 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 820 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 821 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
624 824
625 #define VAR(name,type) slot->name = PL_ ## name; 825 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 826 # include "state.h"
627 #undef VAR 827 #undef VAR
628 } 828 }
… …
755#endif 955#endif
756 956
757/* 957/*
758 * This overrides the default magic get method of %SIG elements. 958 * 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 959 * 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 960 * and instead of trying to save and restore the hash elements, we just provide
761 * readback here. 961 * 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 */ 962 */
766static int 963static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 965{
769 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 1020
824 if (svp) 1021 if (svp)
825 { 1022 {
826 SV *old = *svp; 1023 SV *old = *svp;
827 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
829 return 0; 1026 return 0;
830 } 1027 }
831 } 1028 }
832 1029
… …
850slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
851{ 1048{
852 return 1; 1049 return 1;
853} 1050}
854 1051
855static UNOP coro_setup_op; 1052static UNOP init_perl_op;
856 1053
857static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
858coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
859{ 1056{
860 /* 1057 /*
861 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
862 */ 1059 */
863 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
864 1061
865 PL_runops = RUNOPS_DEFAULT; 1062 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 1063 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 1064 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 1065 PL_comppad = 0;
1066 PL_comppad_name = 0;
1067 PL_comppad_name_fill = 0;
1068 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 1069 PL_curpm = 0;
870 PL_curpad = 0; 1070 PL_curpad = 0;
871 PL_localizing = 0; 1071 PL_localizing = 0;
872 PL_dirty = 0;
873 PL_restartop = 0; 1072 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 1074 PL_parser = 0;
876#endif 1075#endif
1076 PL_hints = 0;
877 1077
878 /* recreate the die/warn hooks */ 1078 /* recreate the die/warn hooks */
879 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1079 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); 1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
881 1081
882 GvSV (PL_defgv) = newSV (0); 1082 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 1083 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 1084 GvSV (PL_errgv) = newSV (0);
885 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0;
886 PL_rs = newSVsv (GvSV (irsgv)); 1087 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 1089
889 { 1090 {
890 dSP; 1091 dSP;
… …
907 */ 1108 */
908 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 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 */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
910 1111
911 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* 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; 1113 init_perl_op.op_next = PL_op;
913 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
914 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
915 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
916 1117
917 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
918 1119
919 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
920 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
921}
922 1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
923static void 1132static void
924coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
925{ 1134{
926 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
927 { 1136 {
928 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
937 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
938 1147
939 /* unwind main stack */ 1148 /* unwind main stack */
940 dounwind (-1); 1149 dounwind (-1);
941 } 1150 }
1151}
942 1152
943 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
946 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1157
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 1158 {
1159 struct coro *current = SvSTATE_current;
1160
1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1162
1163 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */
1165 load_perl (aTHX_ coro);
1166
1167 coro_unwind_stacks (aTHX);
1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1172
1173 // now save some sv's to be free'd later
1174 svf [0] = GvSV (PL_defgv);
1175 svf [1] = (SV *)GvAV (PL_defgv);
1176 svf [2] = GvSV (PL_errgv);
1177 svf [3] = (SV *)PL_defoutgv;
1178 svf [4] = PL_rs;
1179 svf [5] = GvSV (irsgv);
1180 svf [6] = (SV *)GvHV (PL_hintgv);
1181 svf [7] = PL_diehook;
1182 svf [8] = PL_warnhook;
1183 assert (9 == sizeof (svf) / sizeof (*svf));
1184
1185 SvRV_set (coro_current, (SV *)current->hv);
1186 load_perl (aTHX_ current);
1187 }
1188
1189 {
1190 unsigned int i;
1191
1192 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1193 SvREFCNT_dec (svf [i]);
1194
953 SvREFCNT_dec (coro->saved_deffh); 1195 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1196 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1197 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1198 SvREFCNT_dec (coro->invoke_av);
957 1199 }
958 coro_destruct_stacks (aTHX);
959} 1200}
960 1201
961INLINE void 1202INLINE void
962free_coro_mortal (pTHX) 1203free_coro_mortal (pTHX)
963{ 1204{
… …
1160 /* somebody or something will hit me for both perl_run and PL_restartop */ 1401 /* somebody or something will hit me for both perl_run and PL_restartop */
1161 PL_restartop = PL_op; 1402 PL_restartop = PL_op;
1162 perl_run (PL_curinterp); 1403 perl_run (PL_curinterp);
1163 /* 1404 /*
1164 * Unfortunately, there is no way to get at the return values of the 1405 * Unfortunately, there is no way to get at the return values of the
1165 * coro body here, as perl_run destroys these 1406 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1407 * runtime errors here, as this is just a random interpreter, not a thread.
1166 */ 1408 */
1167 1409
1168 /* 1410 /*
1169 * If perl-run returns we assume exit() was being called or the coro 1411 * If perl-run returns we assume exit() was being called or the coro
1170 * fell off the end, which seems to be the only valid (non-bug) 1412 * fell off the end, which seems to be the only valid (non-bug)
1171 * reason for perl_run to return. We try to exit by jumping to the 1413 * reason for perl_run to return. We try to exit by jumping to the
1172 * bootstrap-time "top" top_env, as we cannot restore the "main" 1414 * bootstrap-time "top" top_env, as we cannot restore the "main"
1173 * coroutine as Coro has no such concept 1415 * coroutine as Coro has no such concept.
1416 * This actually isn't valid with the pthread backend, but OSes requiring
1417 * that backend are too broken to do it in a standards-compliant way.
1174 */ 1418 */
1175 PL_top_env = main_top_env; 1419 PL_top_env = main_top_env;
1176 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1420 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1177 } 1421 }
1178} 1422}
… …
1255cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1256{ 1500{
1257 if (!cctx) 1501 if (!cctx)
1258 return; 1502 return;
1259 1503
1260 assert (cctx != cctx_current);//D temporary 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1261 1505
1262 --cctx_count; 1506 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1264 1508
1265 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
… …
1329 /* TODO: throwing up here is considered harmful */ 1573 /* TODO: throwing up here is considered harmful */
1330 1574
1331 if (expect_true (prev != next)) 1575 if (expect_true (prev != next))
1332 { 1576 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1577 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1334 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1578 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1335 1579
1336 if (expect_false (next->flags & CF_RUNNING))
1337 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1338
1339 if (expect_false (next->flags & CF_DESTROYED)) 1580 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1340 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1581 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1341 1582
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1583#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1584 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1344 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1585 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1345#endif 1586#endif
… …
1378 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1379 { 1620 {
1380 /* need to start coroutine */ 1621 /* need to start coroutine */
1381 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1382 /* setup coroutine call */ 1623 /* setup coroutine call */
1383 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1384 } 1625 }
1385 else 1626 else
1386 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1387
1388 assert (!prev->cctx);//D temporary
1389 1628
1390 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1630 if (expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1631 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1632 && !(cctx_current->flags & CC_TRACE)
… …
1429#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1430#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1670
1432/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1433 1672
1434static int 1673static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1675{
1437 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1438 return 0; 1677 return;
1439 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1440 if (coro->on_destroy) 1680 if (coro->on_destroy && !PL_dirty)
1441 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1442 1690
1443 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1444 1692
1445 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1446 { 1694 {
… …
1449 --coro_nready; 1697 --coro_nready;
1450 } 1698 }
1451 else 1699 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1700 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1701
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1702 if (coro->mainstack
1455 { 1703 && coro->mainstack != main_mainstack
1456 struct coro temp; 1704 && coro->slot
1457 1705 && !PL_dirty)
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1459
1460 save_perl (aTHX_ &temp);
1461 load_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1462 1707
1463 coro_destruct (aTHX_ coro); 1708 if (coro->next) coro->next->prev = coro->prev;
1464 1709 if (coro->prev) coro->prev->next = coro->next;
1465 load_perl (aTHX_ &temp); 1710 if (coro == coro_first) coro_first = coro->next;
1466
1467 coro->slot = 0;
1468 }
1469 1711
1470 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1474
1475 if (coro->next) coro->next->prev = coro->prev;
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478
1479 return 1;
1480} 1717}
1481 1718
1482static int 1719static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1721{
… …
1532 1769
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1770 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1771 TRANSFER (ta, 1);
1535} 1772}
1536 1773
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1774/** Coro ********************************************************************/
1561 1775
1562INLINE void 1776INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1777coro_enq (pTHX_ struct coro *coro)
1564{ 1778{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1779 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1780
1568INLINE SV * 1781 SvREFCNT_inc_NN (coro->hv);
1782
1783 coro->next_ready = 0;
1784 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1785 ready [1] = coro;
1786}
1787
1788INLINE struct coro *
1569coro_deq (pTHX) 1789coro_deq (pTHX)
1570{ 1790{
1571 int prio; 1791 int prio;
1572 1792
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1793 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1794 {
1575 return av_shift (coro_ready [prio]); 1795 struct coro **ready = coro_ready [prio];
1796
1797 if (ready [0])
1798 {
1799 struct coro *coro = ready [0];
1800 ready [0] = coro->next_ready;
1801 return coro;
1802 }
1803 }
1576 1804
1577 return 0; 1805 return 0;
1806}
1807
1808static void
1809invoke_sv_ready_hook_helper (void)
1810{
1811 dTHX;
1812 dSP;
1813
1814 ENTER;
1815 SAVETMPS;
1816
1817 PUSHMARK (SP);
1818 PUTBACK;
1819 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1820
1821 FREETMPS;
1822 LEAVE;
1578} 1823}
1579 1824
1580static int 1825static int
1581api_ready (pTHX_ SV *coro_sv) 1826api_ready (pTHX_ SV *coro_sv)
1582{ 1827{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1828 struct coro *coro = SvSTATE (coro_sv);
1591 1829
1592 if (coro->flags & CF_READY) 1830 if (coro->flags & CF_READY)
1593 return 0; 1831 return 0;
1594 1832
1595 coro->flags |= CF_READY; 1833 coro->flags |= CF_READY;
1596 1834
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1835 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1836
1603 if (sv_hook) 1837 if (!coro_nready++)
1604 { 1838 if (coroapi.readyhook)
1605 dSP; 1839 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1840
1621 return 1; 1841 return 1;
1622} 1842}
1623 1843
1624static int 1844static int
… …
1647static void 1867static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1868prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1869{
1650 for (;;) 1870 for (;;)
1651 { 1871 {
1652 SV *next_sv = coro_deq (aTHX); 1872 struct coro *next = coro_deq (aTHX);
1653 1873
1654 if (expect_true (next_sv)) 1874 if (expect_true (next))
1655 { 1875 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1876 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1877 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1878 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1879 else
1662 { 1880 {
1663 next->flags &= ~CF_READY; 1881 next->flags &= ~CF_READY;
1664 --coro_nready; 1882 --coro_nready;
1665 1883
… …
1668 } 1886 }
1669 } 1887 }
1670 else 1888 else
1671 { 1889 {
1672 /* nothing to schedule: call the idle handler */ 1890 /* nothing to schedule: call the idle handler */
1891 if (SvROK (sv_idle)
1892 && SvOBJECT (SvRV (sv_idle)))
1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1898 api_ready (aTHX_ SvRV (sv_idle));
1899 --coro_nready;
1900 }
1901 else
1902 {
1903 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1904 dSP;
1674 1905
1675 ENTER; 1906 ENTER;
1676 SAVETMPS; 1907 SAVETMPS;
1677 1908
1678 PUSHMARK (SP); 1909 PUSHMARK (SP);
1679 PUTBACK; 1910 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1911 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1912
1682 FREETMPS; 1913 FREETMPS;
1683 LEAVE; 1914 LEAVE;
1915 }
1684 } 1916 }
1685 } 1917 }
1686} 1918}
1687 1919
1688INLINE void 1920INLINE void
… …
1786 2018
1787static void 2019static void
1788coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1789{ 2021{
1790 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1791 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1792 2023
1793 if (on_destroyp) 2024 if (on_destroyp)
1794 { 2025 {
1795 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1796 2029
1797 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1798 { 2031 {
1799 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1800 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
… …
1802 PUSHMARK (SP); 2035 PUSHMARK (SP);
1803 2036
1804 if (statusp) 2037 if (statusp)
1805 { 2038 {
1806 int i; 2039 int i;
1807 AV *status = (AV *)SvRV (*statusp);
1808 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1809 2041
1810 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1811 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1812 } 2044 }
… …
1816 } 2048 }
1817 } 2049 }
1818} 2050}
1819 2051
1820static void 2052static void
1821slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1822{ 2054{
1823 int i;
1824 HV *hv = (HV *)SvRV (coro_current);
1825 AV *av = newAV (); 2055 AV *av = newAV ();
1826 2056
2057 /* items are actually not so common, so optimise for this case */
2058 if (items)
2059 {
2060 int i;
2061
1827 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
2063
1828 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
1829 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
2066 }
1830 2067
1831 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
1832 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
1833 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1834 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
1835 2076
1836 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
1837 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
2079
2080 /* as a minor optimisation, we could unwind all stacks here */
2081 /* but that puts extra pressure on pp_slf, and is not worth much */
2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
1838} 2150}
1839 2151
1840/*****************************************************************************/ 2152/*****************************************************************************/
1841/* async pool handler */ 2153/* async pool handler */
1842 2154
… …
1920 2232
1921static void 2233static void
1922coro_rouse_callback (pTHX_ CV *cv) 2234coro_rouse_callback (pTHX_ CV *cv)
1923{ 2235{
1924 dXSARGS; 2236 dXSARGS;
1925 SV *data = (SV *)GENSUB_ARG; 2237 SV *data = (SV *)S_GENSUB_ARG;
1926 2238
1927 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2239 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1928 { 2240 {
1929 /* first call, set args */ 2241 /* first call, set args */
2242 SV *coro = SvRV (data);
1930 AV *av = newAV (); 2243 AV *av = newAV ();
1931 SV *coro = SvRV (data);
1932 2244
1933 SvRV_set (data, (SV *)av); 2245 SvRV_set (data, (SV *)av);
1934 api_ready (aTHX_ coro);
1935 SvREFCNT_dec (coro);
1936 2246
1937 /* better take a full copy of the arguments */ 2247 /* better take a full copy of the arguments */
1938 while (items--) 2248 while (items--)
1939 av_store (av, items, newSVsv (ST (items))); 2249 av_store (av, items, newSVsv (ST (items)));
2250
2251 api_ready (aTHX_ coro);
2252 SvREFCNT_dec (coro);
1940 } 2253 }
1941 2254
1942 XSRETURN_EMPTY; 2255 XSRETURN_EMPTY;
1943} 2256}
1944 2257
… …
1961 2274
1962 EXTEND (SP, AvFILLp (av) + 1); 2275 EXTEND (SP, AvFILLp (av) + 1);
1963 for (i = 0; i <= AvFILLp (av); ++i) 2276 for (i = 0; i <= AvFILLp (av); ++i)
1964 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2277 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1965 2278
1966 /* we have stolen the elements, so ste length to zero and free */ 2279 /* we have stolen the elements, so set length to zero and free */
1967 AvFILLp (av) = -1; 2280 AvFILLp (av) = -1;
1968 av_undef (av); 2281 av_undef (av);
1969 2282
1970 PUTBACK; 2283 PUTBACK;
1971 } 2284 }
… …
1995 || SvTYPE (SvRV (cb)) != SVt_PVCV 2308 || SvTYPE (SvRV (cb)) != SVt_PVCV
1996 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2309 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1997 croak ("Coro::rouse_wait called with illegal callback argument,"); 2310 croak ("Coro::rouse_wait called with illegal callback argument,");
1998 2311
1999 { 2312 {
2000 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2313 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2001 SV *data = (SV *)GENSUB_ARG; 2314 SV *data = (SV *)S_GENSUB_ARG;
2002 2315
2003 frame->data = (void *)data; 2316 frame->data = (void *)data;
2004 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2317 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2005 frame->check = slf_check_rouse_wait; 2318 frame->check = slf_check_rouse_wait;
2006 } 2319 }
… …
2010coro_new_rouse_cb (pTHX) 2323coro_new_rouse_cb (pTHX)
2011{ 2324{
2012 HV *hv = (HV *)SvRV (coro_current); 2325 HV *hv = (HV *)SvRV (coro_current);
2013 struct coro *coro = SvSTATE_hv (hv); 2326 struct coro *coro = SvSTATE_hv (hv);
2014 SV *data = newRV_inc ((SV *)hv); 2327 SV *data = newRV_inc ((SV *)hv);
2015 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2328 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2016 2329
2017 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2330 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2018 SvREFCNT_dec (data); /* magicext increases the refcount */ 2331 SvREFCNT_dec (data); /* magicext increases the refcount */
2019 2332
2020 SvREFCNT_dec (coro->rouse_cb); 2333 SvREFCNT_dec (coro->rouse_cb);
… …
2245 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2246 { 2559 {
2247 if (items > slf_arga) 2560 if (items > slf_arga)
2248 { 2561 {
2249 slf_arga = items; 2562 slf_arga = items;
2250 free (slf_argv); 2563 Safefree (slf_argv);
2251 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2252 } 2565 }
2253 2566
2254 slf_argc = items; 2567 slf_argc = items;
2255 2568
2256 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2261 2574
2262 PL_op->op_ppaddr = pp_slf; 2575 PL_op->op_ppaddr = pp_slf;
2263 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2576 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2264 2577
2265 PL_op = (OP *)&slf_restore; 2578 PL_op = (OP *)&slf_restore;
2579}
2580
2581/*****************************************************************************/
2582/* dynamic wind */
2583
2584static void
2585on_enterleave_call (pTHX_ SV *cb)
2586{
2587 dSP;
2588
2589 PUSHSTACK;
2590
2591 PUSHMARK (SP);
2592 PUTBACK;
2593 call_sv (cb, G_VOID | G_DISCARD);
2594 SPAGAIN;
2595
2596 POPSTACK;
2597}
2598
2599static SV *
2600coro_avp_pop_and_free (pTHX_ AV **avp)
2601{
2602 AV *av = *avp;
2603 SV *res = av_pop (av);
2604
2605 if (AvFILLp (av) < 0)
2606 {
2607 *avp = 0;
2608 SvREFCNT_dec (av);
2609 }
2610
2611 return res;
2612}
2613
2614static void
2615coro_pop_on_enter (pTHX_ void *coro)
2616{
2617 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2618 SvREFCNT_dec (cb);
2619}
2620
2621static void
2622coro_pop_on_leave (pTHX_ void *coro)
2623{
2624 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2625 on_enterleave_call (aTHX_ sv_2mortal (cb));
2266} 2626}
2267 2627
2268/*****************************************************************************/ 2628/*****************************************************************************/
2269/* PerlIO::cede */ 2629/* PerlIO::cede */
2270 2630
… …
2344/* Coro::Semaphore & Coro::Signal */ 2704/* Coro::Semaphore & Coro::Signal */
2345 2705
2346static SV * 2706static SV *
2347coro_waitarray_new (pTHX_ int count) 2707coro_waitarray_new (pTHX_ int count)
2348{ 2708{
2349 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2709 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2350 AV *av = newAV (); 2710 AV *av = newAV ();
2351 SV **ary; 2711 SV **ary;
2352 2712
2353 /* unfortunately, building manually saves memory */ 2713 /* unfortunately, building manually saves memory */
2354 Newx (ary, 2, SV *); 2714 Newx (ary, 2, SV *);
2355 AvALLOC (av) = ary; 2715 AvALLOC (av) = ary;
2716#if PERL_VERSION_ATLEAST (5,10,0)
2356 /*AvARRAY (av) = ary;*/ 2717 AvARRAY (av) = ary;
2718#else
2357 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2719 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2720 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2721 SvPVX ((SV *)av) = (char *)ary;
2722#endif
2358 AvMAX (av) = 1; 2723 AvMAX (av) = 1;
2359 AvFILLp (av) = 0; 2724 AvFILLp (av) = 0;
2360 ary [0] = newSViv (count); 2725 ary [0] = newSViv (count);
2361 2726
2362 return newRV_noinc ((SV *)av); 2727 return newRV_noinc ((SV *)av);
… …
2491{ 2856{
2492 if (items >= 2) 2857 if (items >= 2)
2493 { 2858 {
2494 /* callback form */ 2859 /* callback form */
2495 AV *av = (AV *)SvRV (arg [0]); 2860 AV *av = (AV *)SvRV (arg [0]);
2496 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2861 SV *cb_cv = s_get_cv_croak (arg [1]);
2497 2862
2498 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2863 av_push (av, SvREFCNT_inc_NN (cb_cv));
2499 2864
2500 if (SvIVX (AvARRAY (av)[0]) > 0) 2865 if (SvIVX (AvARRAY (av)[0]) > 0)
2501 coro_semaphore_adjust (aTHX_ av, 0); 2866 coro_semaphore_adjust (aTHX_ av, 0);
2502 2867
2503 frame->prepare = prepare_nop; 2868 frame->prepare = prepare_nop;
… …
2527 AvARRAY (av)[0] = AvARRAY (av)[1]; 2892 AvARRAY (av)[0] = AvARRAY (av)[1];
2528 AvARRAY (av)[1] = cb; 2893 AvARRAY (av)[1] = cb;
2529 2894
2530 cb = av_shift (av); 2895 cb = av_shift (av);
2531 2896
2897 if (SvTYPE (cb) == SVt_PVCV)
2898 {
2899 dSP;
2900 PUSHMARK (SP);
2901 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2902 PUTBACK;
2903 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2904 }
2905 else
2906 {
2532 api_ready (aTHX_ cb); 2907 api_ready (aTHX_ cb);
2533 sv_setiv (cb, 0); /* signal waiter */ 2908 sv_setiv (cb, 0); /* signal waiter */
2909 }
2910
2534 SvREFCNT_dec (cb); 2911 SvREFCNT_dec (cb);
2535 2912
2536 --count; 2913 --count;
2537 } 2914 }
2538} 2915}
… …
2547static void 2924static void
2548slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2925slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2549{ 2926{
2550 AV *av = (AV *)SvRV (arg [0]); 2927 AV *av = (AV *)SvRV (arg [0]);
2551 2928
2929 if (items >= 2)
2930 {
2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2933
2552 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2936
2937 frame->prepare = prepare_nop;
2938 frame->check = slf_check_nop;
2939 }
2940 else if (SvIVX (AvARRAY (av)[0]))
2553 { 2941 {
2554 SvIVX (AvARRAY (av)[0]) = 0; 2942 SvIVX (AvARRAY (av)[0]) = 0;
2555 frame->prepare = prepare_nop; 2943 frame->prepare = prepare_nop;
2556 frame->check = slf_check_nop; 2944 frame->check = slf_check_nop;
2557 } 2945 }
2558 else 2946 else
2559 { 2947 {
2560 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2948 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2561 2949
2562 av_push (av, waiter); 2950 av_push (av, waiter);
2563 2951
2564 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2952 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2565 frame->prepare = prepare_schedule; 2953 frame->prepare = prepare_schedule;
… …
2583 2971
2584static void 2972static void
2585coro_aio_callback (pTHX_ CV *cv) 2973coro_aio_callback (pTHX_ CV *cv)
2586{ 2974{
2587 dXSARGS; 2975 dXSARGS;
2588 AV *state = (AV *)GENSUB_ARG; 2976 AV *state = (AV *)S_GENSUB_ARG;
2589 SV *coro = av_pop (state); 2977 SV *coro = av_pop (state);
2590 SV *data_sv = newSV (sizeof (struct io_state)); 2978 SV *data_sv = newSV (sizeof (struct io_state));
2591 2979
2592 av_extend (state, items - 1); 2980 av_extend (state, items - 1);
2593 2981
… …
2707 3095
2708 for (i = 0; i < items; ++i) 3096 for (i = 0; i < items; ++i)
2709 PUSHs (arg [i]); 3097 PUSHs (arg [i]);
2710 3098
2711 /* now push the callback closure */ 3099 /* now push the callback closure */
2712 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3100 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2713 3101
2714 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2715 PUTBACK; 3103 PUTBACK;
2716 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2717 } 3105 }
2718 3106
2719 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2720 frame->data = (void *)state; 3108 frame->data = (void *)state;
2721 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2722 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2723} 3111}
2724 3112
… …
2735/*****************************************************************************/ 3123/*****************************************************************************/
2736 3124
2737#if CORO_CLONE 3125#if CORO_CLONE
2738# include "clone.c" 3126# include "clone.c"
2739#endif 3127#endif
3128
3129/*****************************************************************************/
3130
3131static SV *
3132coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3133{
3134 SV *coro_sv;
3135 struct coro *coro;
3136 MAGIC *mg;
3137 HV *hv;
3138 SV *cb;
3139 int i;
3140
3141 if (argc > 0)
3142 {
3143 cb = s_get_cv_croak (argv [0]);
3144
3145 if (!is_coro)
3146 {
3147 if (CvISXSUB (cb))
3148 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3149
3150 if (!CvROOT (cb))
3151 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3152 }
3153 }
3154
3155 Newz (0, coro, 1, struct coro);
3156 coro->args = newAV ();
3157 coro->flags = CF_NEW;
3158
3159 if (coro_first) coro_first->prev = coro;
3160 coro->next = coro_first;
3161 coro_first = coro;
3162
3163 coro->hv = hv = newHV ();
3164 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3167
3168 if (argc > 0)
3169 {
3170 av_extend (coro->args, argc + is_coro - 1);
3171
3172 if (is_coro)
3173 {
3174 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3175 cb = (SV *)cv_coro_run;
3176 }
3177
3178 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3179
3180 for (i = 1; i < argc; i++)
3181 av_push (coro->args, newSVsv (argv [i]));
3182 }
3183
3184 return coro_sv;
3185}
2740 3186
2741MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3187MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2742 3188
2743PROTOTYPES: DISABLE 3189PROTOTYPES: DISABLE
2744 3190
… …
2797 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
2798 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
2799 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
2800 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
2801 3247
2802 { 3248 time_init (aTHX);
2803 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2804 3249
2805 if (!svp) croak ("Time::HiRes is required");
2806 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2807
2808 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2809 }
2810
2811 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2812} 3251}
2813 3252
2814SV * 3253SV *
2815new (char *klass, ...) 3254new (SV *klass, ...)
2816 ALIAS: 3255 ALIAS:
2817 Coro::new = 1 3256 Coro::new = 1
2818 CODE: 3257 CODE:
2819{ 3258 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2820 struct coro *coro; 3259 OUTPUT:
2821 MAGIC *mg;
2822 HV *hv;
2823 CV *cb;
2824 int i;
2825
2826 if (items > 1)
2827 {
2828 cb = coro_sv_2cv (aTHX_ ST (1));
2829
2830 if (!ix)
2831 {
2832 if (CvISXSUB (cb))
2833 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2834
2835 if (!CvROOT (cb))
2836 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2837 }
2838 }
2839
2840 Newz (0, coro, 1, struct coro);
2841 coro->args = newAV ();
2842 coro->flags = CF_NEW;
2843
2844 if (coro_first) coro_first->prev = coro;
2845 coro->next = coro_first;
2846 coro_first = coro;
2847
2848 coro->hv = hv = newHV ();
2849 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2850 mg->mg_flags |= MGf_DUP;
2851 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2852
2853 if (items > 1)
2854 {
2855 av_extend (coro->args, items - 1 + ix - 1);
2856
2857 if (ix)
2858 {
2859 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2860 cb = cv_coro_run;
2861 }
2862
2863 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2864
2865 for (i = 2; i < items; i++)
2866 av_push (coro->args, newSVsv (ST (i)));
2867 }
2868}
2869 OUTPUT:
2870 RETVAL 3260 RETVAL
2871 3261
2872void 3262void
2873transfer (...) 3263transfer (...)
2874 PROTOTYPE: $$ 3264 PROTOTYPE: $$
2875 CODE: 3265 CODE:
2876 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2877 3267
2878bool
2879_destroy (SV *coro_sv)
2880 CODE:
2881 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2882 OUTPUT:
2883 RETVAL
2884
2885void 3268void
2886_exit (int code) 3269_exit (int code)
2887 PROTOTYPE: $ 3270 PROTOTYPE: $
2888 CODE: 3271 CODE:
2889 _exit (code); 3272 _exit (code);
… …
2891SV * 3274SV *
2892clone (Coro::State coro) 3275clone (Coro::State coro)
2893 CODE: 3276 CODE:
2894{ 3277{
2895#if CORO_CLONE 3278#if CORO_CLONE
2896 struct coro *ncoro = coro_clone (coro); 3279 struct coro *ncoro = coro_clone (aTHX_ coro);
2897 MAGIC *mg; 3280 MAGIC *mg;
2898 /* TODO: too much duplication */ 3281 /* TODO: too much duplication */
2899 ncoro->hv = newHV (); 3282 ncoro->hv = newHV ();
2900 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3283 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2901 mg->mg_flags |= MGf_DUP; 3284 mg->mg_flags |= MGf_DUP;
… …
2963 eval = 1 3346 eval = 1
2964 CODE: 3347 CODE:
2965{ 3348{
2966 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2967 { 3350 {
2968 struct coro temp; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
2969 3353
2970 if (!(coro->flags & CF_RUNNING)) 3354 if (current != coro)
2971 { 3355 {
2972 PUTBACK; 3356 PUTBACK;
2973 save_perl (aTHX_ &temp); 3357 save_perl (aTHX_ current);
2974 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3368 SPAGAIN;
2975 } 3369 }
2976 3370
2977 {
2978 dSP;
2979 ENTER;
2980 SAVETMPS;
2981 PUTBACK;
2982 PUSHSTACK; 3371 PUSHSTACK;
3372
2983 PUSHMARK (SP); 3373 PUSHMARK (SP);
3374 PUTBACK;
2984 3375
2985 if (ix) 3376 if (ix)
2986 eval_sv (coderef, 0); 3377 eval_sv (coderef, 0);
2987 else 3378 else
2988 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3379 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2989 3380
2990 POPSTACK; 3381 POPSTACK;
2991 SPAGAIN; 3382 SPAGAIN;
2992 FREETMPS;
2993 LEAVE;
2994 PUTBACK;
2995 }
2996 3383
2997 if (!(coro->flags & CF_RUNNING)) 3384 if (current != coro)
2998 { 3385 {
3386 PUTBACK;
3387 slf_frame = slf_save;
2999 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3000 load_perl (aTHX_ &temp); 3389 load_perl (aTHX_ current);
3001 SPAGAIN; 3390 SPAGAIN;
3002 } 3391 }
3003 } 3392 }
3004} 3393}
3005 3394
… …
3009 ALIAS: 3398 ALIAS:
3010 is_ready = CF_READY 3399 is_ready = CF_READY
3011 is_running = CF_RUNNING 3400 is_running = CF_RUNNING
3012 is_new = CF_NEW 3401 is_new = CF_NEW
3013 is_destroyed = CF_DESTROYED 3402 is_destroyed = CF_DESTROYED
3403 is_suspended = CF_SUSPENDED
3014 CODE: 3404 CODE:
3015 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3016 OUTPUT: 3406 OUTPUT:
3017 RETVAL 3407 RETVAL
3018 3408
3019void 3409void
3020throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3021 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3022 CODE: 3412 CODE:
3023{ 3413{
3024 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3025 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3026 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3027 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 SvGETMAGIC (exception);
3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3028} 3419}
3029 3420
3030void 3421void
3031api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3032 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
3083 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3474 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3084 3475
3085 SV *tmp = *src; *src = *dst; *dst = tmp; 3476 SV *tmp = *src; *src = *dst; *dst = tmp;
3086 } 3477 }
3087 3478
3479void
3480cancel (Coro::State self)
3481 CODE:
3482 coro_state_destroy (aTHX_ self);
3483
3484SV *
3485enable_times (int enabled = enable_times)
3486 CODE:
3487{
3488 RETVAL = boolSV (enable_times);
3489
3490 if (enabled != enable_times)
3491 {
3492 enable_times = enabled;
3493
3494 coro_times_update ();
3495 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3496 }
3497}
3498 OUTPUT:
3499 RETVAL
3500
3501void
3502times (Coro::State self)
3503 PPCODE:
3504{
3505 struct coro *current = SvSTATE (coro_current);
3506
3507 if (expect_false (current == self))
3508 {
3509 coro_times_update ();
3510 coro_times_add (SvSTATE (coro_current));
3511 }
3512
3513 EXTEND (SP, 2);
3514 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3516
3517 if (expect_false (current == self))
3518 coro_times_sub (SvSTATE (coro_current));
3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3539
3088 3540
3089MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
3090 3542
3091BOOT: 3543BOOT:
3092{ 3544{
3093 int i;
3094
3095 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3545 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3096 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3546 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3097 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3547 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3098 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3548 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3099 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3549 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3100 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3550 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3101 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3551 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3102 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3552 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3553 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3103 3554
3104 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3555 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3105 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3556 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3106 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3557 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3107 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3558 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3108 3559
3109 coro_stash = gv_stashpv ("Coro", TRUE); 3560 coro_stash = gv_stashpv ("Coro", TRUE);
3110 3561
3111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3562 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3563 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3113 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3564 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3114 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3565 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3115 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3566 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3116 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3567 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3117
3118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3119 coro_ready[i] = newAV ();
3120 3568
3121 { 3569 {
3122 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3570 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3123 3571
3124 coroapi.schedule = api_schedule; 3572 coroapi.schedule = api_schedule;
… …
3134 sv_setiv (sv, (IV)&coroapi); 3582 sv_setiv (sv, (IV)&coroapi);
3135 SvREADONLY_on (sv); 3583 SvREADONLY_on (sv);
3136 } 3584 }
3137} 3585}
3138 3586
3587SV *
3588async (...)
3589 PROTOTYPE: &@
3590 CODE:
3591 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3592 api_ready (aTHX_ RETVAL);
3593 OUTPUT:
3594 RETVAL
3595
3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3139void 3603void
3140terminate (...) 3604terminate (...)
3141 CODE: 3605 CODE:
3142 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3143 3607
3144void 3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3612
3613void
3145schedule (...) 3614schedule (...)
3146 CODE: 3615 CODE:
3147 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3148 3617
3149void 3618void
… …
3163 3632
3164void 3633void
3165cede_notself (...) 3634cede_notself (...)
3166 CODE: 3635 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3636 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3168
3169void
3170_cancel (Coro::State self)
3171 CODE:
3172 coro_state_destroy (aTHX_ self);
3173 coro_call_on_destroy (aTHX_ self);
3174 3637
3175void 3638void
3176_set_current (SV *current) 3639_set_current (SV *current)
3177 PROTOTYPE: $ 3640 PROTOTYPE: $
3178 CODE: 3641 CODE:
… …
3182void 3645void
3183_set_readyhook (SV *hook) 3646_set_readyhook (SV *hook)
3184 PROTOTYPE: $ 3647 PROTOTYPE: $
3185 CODE: 3648 CODE:
3186 SvREFCNT_dec (coro_readyhook); 3649 SvREFCNT_dec (coro_readyhook);
3650 SvGETMAGIC (hook);
3651 if (SvOK (hook))
3652 {
3187 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3653 coro_readyhook = newSVsv (hook);
3654 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3655 }
3656 else
3657 {
3658 coro_readyhook = 0;
3659 CORO_READYHOOK = 0;
3660 }
3188 3661
3189int 3662int
3190prio (Coro::State coro, int newprio = 0) 3663prio (Coro::State coro, int newprio = 0)
3191 PROTOTYPE: $;$ 3664 PROTOTYPE: $;$
3192 ALIAS: 3665 ALIAS:
… …
3198 if (items > 1) 3671 if (items > 1)
3199 { 3672 {
3200 if (ix) 3673 if (ix)
3201 newprio = coro->prio - newprio; 3674 newprio = coro->prio - newprio;
3202 3675
3203 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3676 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3204 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3677 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3205 3678
3206 coro->prio = newprio; 3679 coro->prio = newprio;
3207 } 3680 }
3208} 3681}
3209 OUTPUT: 3682 OUTPUT:
… …
3224 RETVAL = coro_nready; 3697 RETVAL = coro_nready;
3225 OUTPUT: 3698 OUTPUT:
3226 RETVAL 3699 RETVAL
3227 3700
3228void 3701void
3702suspend (Coro::State self)
3703 PROTOTYPE: $
3704 CODE:
3705 self->flags |= CF_SUSPENDED;
3706
3707void
3708resume (Coro::State self)
3709 PROTOTYPE: $
3710 CODE:
3711 self->flags &= ~CF_SUSPENDED;
3712
3713void
3229_pool_handler (...) 3714_pool_handler (...)
3230 CODE: 3715 CODE:
3231 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3716 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3232 3717
3233void 3718void
… …
3244 for (i = 1; i < items; ++i) 3729 for (i = 1; i < items; ++i)
3245 av_push (av, SvREFCNT_inc_NN (ST (i))); 3730 av_push (av, SvREFCNT_inc_NN (ST (i)));
3246 3731
3247 if ((SV *)hv == &PL_sv_undef) 3732 if ((SV *)hv == &PL_sv_undef)
3248 { 3733 {
3249 PUSHMARK (SP); 3734 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3250 EXTEND (SP, 2);
3251 PUSHs (sv_Coro);
3252 PUSHs ((SV *)cv_pool_handler);
3253 PUTBACK;
3254 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3255 SPAGAIN;
3256
3257 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3735 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3736 SvREFCNT_dec (sv);
3258 } 3737 }
3259 3738
3260 { 3739 {
3261 struct coro *coro = SvSTATE_hv (hv); 3740 struct coro *coro = SvSTATE_hv (hv);
3262 3741
… …
3286rouse_wait (...) 3765rouse_wait (...)
3287 PROTOTYPE: ;$ 3766 PROTOTYPE: ;$
3288 PPCODE: 3767 PPCODE:
3289 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3768 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3290 3769
3770void
3771on_enter (SV *block)
3772 ALIAS:
3773 on_leave = 1
3774 PROTOTYPE: &
3775 CODE:
3776{
3777 struct coro *coro = SvSTATE_current;
3778 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3779
3780 block = s_get_cv_croak (block);
3781
3782 if (!*avp)
3783 *avp = newAV ();
3784
3785 av_push (*avp, SvREFCNT_inc (block));
3786
3787 if (!ix)
3788 on_enterleave_call (aTHX_ block);
3789
3790 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3791 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3792 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3793}
3794
3291 3795
3292MODULE = Coro::State PACKAGE = PerlIO::cede 3796MODULE = Coro::State PACKAGE = PerlIO::cede
3293 3797
3294BOOT: 3798BOOT:
3295 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3799 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3298MODULE = Coro::State PACKAGE = Coro::Semaphore 3802MODULE = Coro::State PACKAGE = Coro::Semaphore
3299 3803
3300SV * 3804SV *
3301new (SV *klass, SV *count = 0) 3805new (SV *klass, SV *count = 0)
3302 CODE: 3806 CODE:
3807{
3808 int semcnt = 1;
3809
3810 if (count)
3811 {
3812 SvGETMAGIC (count);
3813
3814 if (SvOK (count))
3815 semcnt = SvIV (count);
3816 }
3817
3303 RETVAL = sv_bless ( 3818 RETVAL = sv_bless (
3304 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3819 coro_waitarray_new (aTHX_ semcnt),
3305 GvSTASH (CvGV (cv)) 3820 GvSTASH (CvGV (cv))
3306 ); 3821 );
3822}
3307 OUTPUT: 3823 OUTPUT:
3308 RETVAL 3824 RETVAL
3309 3825
3310# helper for Coro::Channel 3826# helper for Coro::Channel and others
3311SV * 3827SV *
3312_alloc (int count) 3828_alloc (int count)
3313 CODE: 3829 CODE:
3314 RETVAL = coro_waitarray_new (aTHX_ count); 3830 RETVAL = coro_waitarray_new (aTHX_ count);
3315 OUTPUT: 3831 OUTPUT:
… …
3373 for (i = 1; i <= wcount; ++i) 3889 for (i = 1; i <= wcount; ++i)
3374 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3890 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3375 } 3891 }
3376} 3892}
3377 3893
3894MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3895
3896void
3897_may_delete (SV *sem, int count, int extra_refs)
3898 PPCODE:
3899{
3900 AV *av = (AV *)SvRV (sem);
3901
3902 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3903 && AvFILLp (av) == 0 /* no waiters, just count */
3904 && SvIV (AvARRAY (av)[0]) == count)
3905 XSRETURN_YES;
3906
3907 XSRETURN_NO;
3908}
3909
3378MODULE = Coro::State PACKAGE = Coro::Signal 3910MODULE = Coro::State PACKAGE = Coro::Signal
3379 3911
3380SV * 3912SV *
3381new (SV *klass) 3913new (SV *klass)
3382 CODE: 3914 CODE:
… …
3453 3985
3454void 3986void
3455_register (char *target, char *proto, SV *req) 3987_register (char *target, char *proto, SV *req)
3456 CODE: 3988 CODE:
3457{ 3989{
3458 CV *req_cv = coro_sv_2cv (aTHX_ req); 3990 SV *req_cv = s_get_cv_croak (req);
3459 /* newXSproto doesn't return the CV on 5.8 */ 3991 /* newXSproto doesn't return the CV on 5.8 */
3460 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3992 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3461 sv_setpv ((SV *)slf_cv, proto); 3993 sv_setpv ((SV *)slf_cv, proto);
3462 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3994 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3463} 3995}
3464 3996
3997MODULE = Coro::State PACKAGE = Coro::Select
3998
3999void
4000patch_pp_sselect ()
4001 CODE:
4002 if (!coro_old_pp_sselect)
4003 {
4004 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4005 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4006 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4007 }
4008
4009void
4010unpatch_pp_sselect ()
4011 CODE:
4012 if (coro_old_pp_sselect)
4013 {
4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4015 coro_old_pp_sselect = 0;
4016 }
4017

Diff Legend

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