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.348 by root, Wed Jun 10 00:20:26 2009 UTC vs.
Revision 1.403 by root, Sun May 22 20:13:33 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
18#include <stddef.h>
13#include <stdio.h> 19#include <stdio.h>
14#include <errno.h> 20#include <errno.h>
15#include <assert.h> 21#include <assert.h>
16 22
17#ifdef WIN32 23#ifndef SVs_PADSTALE
24# define SVs_PADSTALE 0
25#endif
26
27#if defined(_WIN32)
28# undef HAS_GETTIMEOFDAY
18# undef setjmp 29# undef setjmp
19# undef longjmp 30# undef longjmp
20# undef _exit 31# undef _exit
21# define setjmp _setjmp /* deep magic */ 32# define setjmp _setjmp /* deep magic */
22#else 33#else
… …
51#endif 62#endif
52 63
53/* the maximum number of idle cctx that will be pooled */ 64/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 65static int cctx_max_idle = 4;
55 66
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 67#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 68# undef CORO_STACKGUARD
117#endif 69#endif
118 70
119#ifndef CORO_STACKGUARD 71#ifndef CORO_STACKGUARD
… …
137 89
138#define IN_DESTRUCT PL_dirty 90#define IN_DESTRUCT PL_dirty
139 91
140#if __GNUC__ >= 3 92#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 93# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 94# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 95# define INLINE static inline
144#else 96#else
145# define attribute(x) 97# define attribute(x)
146# define expect(expr,value) (expr) 98# define expect(expr,value) (expr)
147# define INLINE static 99# define INLINE static
… …
159# if CORO_PTHREAD 111# if CORO_PTHREAD
160static void *coro_thx; 112static void *coro_thx;
161# endif 113# endif
162#endif 114#endif
163 115
116#ifdef __linux
117# include <time.h> /* for timespec */
118# include <syscall.h> /* for SYS_* */
119# ifdef SYS_clock_gettime
120# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
121# define CORO_CLOCK_MONOTONIC 1
122# define CORO_CLOCK_THREAD_CPUTIME_ID 3
123# endif
124#endif
125
164static double (*nvtime)(); /* so why doesn't it take void? */ 126static double (*nvtime)(); /* so why doesn't it take void? */
127static void (*u2time)(pTHX_ UV ret[2]);
165 128
166/* we hijack an hopefully unused CV flag for our purposes */ 129/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 130#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 131static OP *pp_slf (pTHX);
132static void slf_destroy (pTHX_ struct coro *coro);
169 133
170static U32 cctx_gen; 134static U32 cctx_gen;
171static size_t cctx_stacksize = CORO_STACKSIZE; 135static size_t cctx_stacksize = CORO_STACKSIZE;
172static struct CoroAPI coroapi; 136static struct CoroAPI coroapi;
173static AV *main_mainstack; /* used to differentiate between $main and others */ 137static AV *main_mainstack; /* used to differentiate between $main and others */
… …
190static SV *sv_pool_size; 154static SV *sv_pool_size;
191static SV *sv_async_pool_idle; /* description string */ 155static SV *sv_async_pool_idle; /* description string */
192static AV *av_async_pool; /* idle pool */ 156static AV *av_async_pool; /* idle pool */
193static SV *sv_Coro; /* class string */ 157static SV *sv_Coro; /* class string */
194static CV *cv_pool_handler; 158static CV *cv_pool_handler;
195static CV *cv_coro_state_new;
196 159
197/* Coro::AnyEvent */ 160/* Coro::AnyEvent */
198static SV *sv_activity; 161static SV *sv_activity;
199 162
163/* enable processtime/realtime profiling */
164static char enable_times;
165typedef U32 coro_ts[2];
166static coro_ts time_real, time_cpu;
167static char times_valid;
168
200static struct coro_cctx *cctx_first; 169static struct coro_cctx *cctx_first;
201static int cctx_count, cctx_idle; 170static int cctx_count, cctx_idle;
202 171
203enum { 172enum
173{
204 CC_MAPPED = 0x01, 174 CC_MAPPED = 0x01,
205 CC_NOREUSE = 0x02, /* throw this away after tracing */ 175 CC_NOREUSE = 0x02, /* throw this away after tracing */
206 CC_TRACE = 0x04, 176 CC_TRACE = 0x04,
207 CC_TRACE_SUB = 0x08, /* trace sub calls */ 177 CC_TRACE_SUB = 0x08, /* trace sub calls */
208 CC_TRACE_LINE = 0x10, /* trace each statement */ 178 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
229 int valgrind_id; 199 int valgrind_id;
230#endif 200#endif
231 unsigned char flags; 201 unsigned char flags;
232} coro_cctx; 202} coro_cctx;
233 203
234coro_cctx *cctx_current; /* the currently running cctx */ 204static coro_cctx *cctx_current; /* the currently running cctx */
235 205
236/*****************************************************************************/ 206/*****************************************************************************/
237 207
208static MGVTBL coro_state_vtbl;
209
238enum { 210enum
211{
239 CF_RUNNING = 0x0001, /* coroutine is running */ 212 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 213 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 214 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 215 CF_ZOMBIE = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 216 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
217 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
244}; 218};
245 219
246/* the structure where most of the perl state is stored, overlaid on the cxstack */ 220/* the structure where most of the perl state is stored, overlaid on the cxstack */
247typedef struct 221typedef struct
248{ 222{
… …
254#define VAR(name,type) type name; 228#define VAR(name,type) type name;
255# include "state.h" 229# include "state.h"
256#undef VAR 230#undef VAR
257} perl_slots; 231} perl_slots;
258 232
233// how many context stack entries do we need for perl_slots
259#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 234#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
260 235
261/* this is a structure representing a perl-level coroutine */ 236/* this is a structure representing a perl-level coroutine */
262struct coro { 237struct coro
238{
263 /* the C coroutine allocated to this perl coroutine, if any */ 239 /* the C coroutine allocated to this perl coroutine, if any */
264 coro_cctx *cctx; 240 coro_cctx *cctx;
265 241
266 /* ready queue */ 242 /* ready queue */
267 struct coro *next_ready; 243 struct coro *next_ready;
… …
269 /* state data */ 245 /* state data */
270 struct CoroSLF slf_frame; /* saved slf frame */ 246 struct CoroSLF slf_frame; /* saved slf frame */
271 AV *mainstack; 247 AV *mainstack;
272 perl_slots *slot; /* basically the saved sp */ 248 perl_slots *slot; /* basically the saved sp */
273 249
274 CV *startcv; /* the CV to execute */ 250 CV *startcv; /* the CV to execute */
275 AV *args; /* data associated with this coroutine (initial args) */ 251 AV *args; /* data associated with this coroutine (initial args) */
276 int refcnt; /* coroutines are refcounted, yes */
277 int flags; /* CF_ flags */ 252 int flags; /* CF_ flags */
278 HV *hv; /* the perl hash associated with this coro, if any */ 253 HV *hv; /* the perl hash associated with this coro, if any */
279 void (*on_destroy)(pTHX_ struct coro *coro);
280 254
281 /* statistics */ 255 /* statistics */
282 int usecount; /* number of transfers to this coro */ 256 int usecount; /* number of transfers to this coro */
283 257
284 /* coro process data */ 258 /* coro process data */
285 int prio; 259 int prio;
286 SV *except; /* exception to be thrown */ 260 SV *except; /* exception to be thrown */
287 SV *rouse_cb; 261 SV *rouse_cb; /* last rouse callback */
262 AV *on_destroy; /* callbacks or coros to notify on destroy */
263 AV *status; /* the exit status list */
288 264
289 /* async_pool */ 265 /* async_pool */
290 SV *saved_deffh; 266 SV *saved_deffh;
291 SV *invoke_cb; 267 SV *invoke_cb;
292 AV *invoke_av; 268 AV *invoke_av;
293 269
294 /* on_enter/on_leave */ 270 /* on_enter/on_leave */
295 AV *on_enter; 271 AV *on_enter;
296 AV *on_leave; 272 AV *on_leave;
297 273
274 /* swap_sv */
275 AV *swap_sv;
276
277 /* times */
278 coro_ts t_cpu, t_real;
279
298 /* linked list */ 280 /* linked list */
299 struct coro *next, *prev; 281 struct coro *next, *prev;
300}; 282};
301 283
302typedef struct coro *Coro__State; 284typedef struct coro *Coro__State;
303typedef struct coro *Coro__State_or_hashref; 285typedef struct coro *Coro__State_or_hashref;
304 286
305/* the following variables are effectively part of the perl context */ 287/* the following variables are effectively part of the perl context */
306/* and get copied between struct coro and these variables */ 288/* and get copied between struct coro and these variables */
307/* the mainr easonw e don't support windows process emulation */ 289/* the main reason we don't support windows process emulation */
308static struct CoroSLF slf_frame; /* the current slf frame */ 290static struct CoroSLF slf_frame; /* the current slf frame */
309 291
310/** Coro ********************************************************************/ 292/** Coro ********************************************************************/
311 293
312#define PRIO_MAX 3 294#define CORO_PRIO_MAX 3
313#define PRIO_HIGH 1 295#define CORO_PRIO_HIGH 1
314#define PRIO_NORMAL 0 296#define CORO_PRIO_NORMAL 0
315#define PRIO_LOW -1 297#define CORO_PRIO_LOW -1
316#define PRIO_IDLE -3 298#define CORO_PRIO_IDLE -3
317#define PRIO_MIN -4 299#define CORO_PRIO_MIN -4
318 300
319/* for Coro.pm */ 301/* for Coro.pm */
320static SV *coro_current; 302static SV *coro_current;
321static SV *coro_readyhook; 303static SV *coro_readyhook;
322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */ 304static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
323static CV *cv_coro_run, *cv_coro_terminate; 305static CV *cv_coro_run;
324static struct coro *coro_first; 306static struct coro *coro_first;
325#define coro_nready coroapi.nready 307#define coro_nready coroapi.nready
308
309/** Coro::Select ************************************************************/
310
311static OP *(*coro_old_pp_sselect) (pTHX);
312static SV *coro_select_select;
313
314/* horrible hack, but if it works... */
315static OP *
316coro_pp_sselect (pTHX)
317{
318 dSP;
319 PUSHMARK (SP - 4); /* fake argument list */
320 XPUSHs (coro_select_select);
321 PUTBACK;
322
323 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
324 PL_op->op_flags |= OPf_STACKED;
325 PL_op->op_private = 0;
326 return PL_ppaddr [OP_ENTERSUB](aTHX);
327}
328
329/** time stuff **************************************************************/
330
331#ifdef HAS_GETTIMEOFDAY
332
333static void
334coro_u2time (pTHX_ UV ret[2])
335{
336 struct timeval tv;
337 gettimeofday (&tv, 0);
338
339 ret [0] = tv.tv_sec;
340 ret [1] = tv.tv_usec;
341}
342
343static double
344coro_nvtime ()
345{
346 struct timeval tv;
347 gettimeofday (&tv, 0);
348
349 return tv.tv_sec + tv.tv_usec * 1e-6;
350}
351
352static void
353time_init (pTHX)
354{
355 nvtime = coro_nvtime;
356 u2time = coro_u2time;
357}
358
359#else
360
361static void
362time_init (pTHX)
363{
364 SV **svp;
365
366 require_pv ("Time/HiRes.pm");
367
368 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
369
370 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
371 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
372
373 nvtime = INT2PTR (double (*)(), SvIV (*svp));
374
375 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
376 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
377}
378
379#endif
326 380
327/** lowlevel stuff **********************************************************/ 381/** lowlevel stuff **********************************************************/
328 382
329static SV * 383static SV *
330coro_get_sv (pTHX_ const char *name, int create) 384coro_get_sv (pTHX_ const char *name, int create)
… …
354 get_hv (name, create); 408 get_hv (name, create);
355#endif 409#endif
356 return get_hv (name, create); 410 return get_hv (name, create);
357} 411}
358 412
359/* may croak */ 413INLINE void
360INLINE CV * 414coro_times_update ()
361coro_sv_2cv (pTHX_ SV *sv)
362{ 415{
363 HV *st; 416#ifdef coro_clock_gettime
364 GV *gvp; 417 struct timespec ts;
365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366 418
367 if (!cv) 419 ts.tv_sec = ts.tv_nsec = 0;
368 croak ("code reference expected"); 420 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
421 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
369 422
370 return cv; 423 ts.tv_sec = ts.tv_nsec = 0;
424 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
425 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
426#else
427 dTHX;
428 UV tv[2];
429
430 u2time (aTHX_ tv);
431 time_real [0] = tv [0];
432 time_real [1] = tv [1] * 1000;
433#endif
434}
435
436INLINE void
437coro_times_add (struct coro *c)
438{
439 c->t_real [1] += time_real [1];
440 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
441 c->t_real [0] += time_real [0];
442
443 c->t_cpu [1] += time_cpu [1];
444 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
445 c->t_cpu [0] += time_cpu [0];
446}
447
448INLINE void
449coro_times_sub (struct coro *c)
450{
451 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
452 c->t_real [1] -= time_real [1];
453 c->t_real [0] -= time_real [0];
454
455 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
456 c->t_cpu [1] -= time_cpu [1];
457 c->t_cpu [0] -= time_cpu [0];
371} 458}
372 459
373/*****************************************************************************/ 460/*****************************************************************************/
374/* magic glue */ 461/* magic glue */
375 462
… …
387 : 0) 474 : 0)
388 475
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 476#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state) 477#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391 478
479INLINE MAGIC *
480SvSTATEhv_p (pTHX_ SV *coro)
481{
482 MAGIC *mg;
483
484 if (expect_true (
485 SvTYPE (coro) == SVt_PVHV
486 && (mg = CORO_MAGIC_state (coro))
487 && mg->mg_virtual == &coro_state_vtbl
488 ))
489 return mg;
490
491 return 0;
492}
493
392INLINE struct coro * 494INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro) 495SvSTATE_ (pTHX_ SV *coro)
394{ 496{
395 HV *stash;
396 MAGIC *mg; 497 MAGIC *mg;
397 498
398 if (SvROK (coro)) 499 if (SvROK (coro))
399 coro = SvRV (coro); 500 coro = SvRV (coro);
400 501
401 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 502 mg = SvSTATEhv_p (aTHX_ coro);
503 if (!mg)
402 croak ("Coro::State object required"); 504 croak ("Coro::State object required");
403 505
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr; 506 return (struct coro *)mg->mg_ptr;
414} 507}
415 508
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 509#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417 510
… …
475static int 568static int
476coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 569coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
477{ 570{
478 AV *padlist; 571 AV *padlist;
479 AV *av = (AV *)mg->mg_obj; 572 AV *av = (AV *)mg->mg_obj;
573
574 /* perl manages to free our internal AV and _then_ call us */
575 if (IN_DESTRUCT)
576 return 0;
480 577
481 /* casting is fun. */ 578 /* casting is fun. */
482 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 579 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
483 free_padlist (aTHX_ padlist); 580 free_padlist (aTHX_ padlist);
484 581
… …
533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 630 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
534} 631}
535 632
536/** load & save, init *******************************************************/ 633/** load & save, init *******************************************************/
537 634
635/* swap sv heads, at least logically */
636static void
637swap_svs (pTHX_ Coro__State c)
638{
639 int i;
640
641 for (i = 0; i <= AvFILLp (c->swap_sv); )
642 {
643 SV *a = AvARRAY (c->swap_sv)[i++];
644 SV *b = AvARRAY (c->swap_sv)[i++];
645
646 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
647 SV tmp;
648
649 /* swap sv_any */
650 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
651
652 /* swap sv_flags */
653 SvFLAGS (&tmp) = SvFLAGS (a);
654 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
655 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
656
657#if PERL_VERSION_ATLEAST (5,10,0)
658 /* perl 5.10 complicates this _quite_ a bit, but it also is
659 * much faster, so no quarrels here. alternatively, we could
660 * sv_upgrade to avoid this.
661 */
662 {
663 /* swap sv_u */
664 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
665
666 /* if SvANY points to the head, we need to adjust the pointers,
667 * as the pointer for a still points to b, and maybe vice versa.
668 */
669 #define svany_in_head(type) \
670 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
671
672 if (svany_in_head (SvTYPE (a)))
673 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
674
675 if (svany_in_head (SvTYPE (b)))
676 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
677 }
678#endif
679 }
680}
681
682#define SWAP_SVS(coro) \
683 if (expect_false ((coro)->swap_sv)) \
684 swap_svs (aTHX_ (coro))
685
538static void 686static void
539on_enterleave_call (pTHX_ SV *cb); 687on_enterleave_call (pTHX_ SV *cb);
540 688
541static void 689static void
542load_perl (pTHX_ Coro__State c) 690load_perl (pTHX_ Coro__State c)
… …
573 } 721 }
574 722
575 slf_frame = c->slf_frame; 723 slf_frame = c->slf_frame;
576 CORO_THROW = c->except; 724 CORO_THROW = c->except;
577 725
726 if (expect_false (enable_times))
727 {
728 if (expect_false (!times_valid))
729 coro_times_update ();
730
731 coro_times_sub (c);
732 }
733
578 if (expect_false (c->on_enter)) 734 if (expect_false (c->on_enter))
579 { 735 {
580 int i; 736 int i;
581 737
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 738 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 739 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 } 740 }
741
742 SWAP_SVS (c);
585} 743}
586 744
587static void 745static void
588save_perl (pTHX_ Coro__State c) 746save_perl (pTHX_ Coro__State c)
589{ 747{
748 SWAP_SVS (c);
749
590 if (expect_false (c->on_leave)) 750 if (expect_false (c->on_leave))
591 { 751 {
592 int i; 752 int i;
593 753
594 for (i = AvFILLp (c->on_leave); i >= 0; --i) 754 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]); 755 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
756 }
757
758 times_valid = 0;
759
760 if (expect_false (enable_times))
761 {
762 coro_times_update (); times_valid = 1;
763 coro_times_add (c);
596 } 764 }
597 765
598 c->except = CORO_THROW; 766 c->except = CORO_THROW;
599 c->slf_frame = slf_frame; 767 c->slf_frame = slf_frame;
600 768
… …
615 { 783 {
616 while (expect_true (cxix >= 0)) 784 while (expect_true (cxix >= 0))
617 { 785 {
618 PERL_CONTEXT *cx = &ccstk[cxix--]; 786 PERL_CONTEXT *cx = &ccstk[cxix--];
619 787
620 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 788 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
621 { 789 {
622 CV *cv = cx->blk_sub.cv; 790 CV *cv = cx->blk_sub.cv;
623 791
624 if (expect_true (CvDEPTH (cv))) 792 if (expect_true (CvDEPTH (cv)))
625 { 793 {
… …
644 812
645 PUTBACK; 813 PUTBACK;
646 } 814 }
647 815
648 /* allocate some space on the context stack for our purposes */ 816 /* allocate some space on the context stack for our purposes */
649 /* we manually unroll here, as usually 2 slots is enough */ 817 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
650 if (SLOT_COUNT >= 1) CXINC;
651 if (SLOT_COUNT >= 2) CXINC;
652 if (SLOT_COUNT >= 3) CXINC;
653 { 818 {
654 int i; 819 unsigned int i;
820
655 for (i = 3; i < SLOT_COUNT; ++i) 821 for (i = 0; i < SLOT_COUNT; ++i)
656 CXINC; 822 CXINC;
657 } 823
658 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 824 cxstack_ix -= SLOT_COUNT; /* undo allocation */
825 }
659 826
660 c->mainstack = PL_mainstack; 827 c->mainstack = PL_mainstack;
661 828
662 { 829 {
663 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 830 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
684# define coro_init_stacks(thx) init_stacks () 851# define coro_init_stacks(thx) init_stacks ()
685#else 852#else
686static void 853static void
687coro_init_stacks (pTHX) 854coro_init_stacks (pTHX)
688{ 855{
689 PL_curstackinfo = new_stackinfo(32, 8); 856 PL_curstackinfo = new_stackinfo(32, 4 + SLOT_COUNT); /* 3 is minimum due to perl rounding down in scope.c:GROW() */
690 PL_curstackinfo->si_type = PERLSI_MAIN; 857 PL_curstackinfo->si_type = PERLSI_MAIN;
691 PL_curstack = PL_curstackinfo->si_stack; 858 PL_curstack = PL_curstackinfo->si_stack;
692 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 859 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
693 860
694 PL_stack_base = AvARRAY(PL_curstack); 861 PL_stack_base = AvARRAY(PL_curstack);
… …
801#endif 968#endif
802 969
803/* 970/*
804 * This overrides the default magic get method of %SIG elements. 971 * This overrides the default magic get method of %SIG elements.
805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 972 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
806 * and instead of trying to save and restore the hash elements, we just provide 973 * and instead of trying to save and restore the hash elements (extremely slow),
807 * readback here. 974 * we just provide our own readback here.
808 */ 975 */
809static int 976static int
810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 977coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
811{ 978{
812 const char *s = MgPV_nolen_const (mg); 979 const char *s = MgPV_nolen_const (mg);
… …
893slf_check_repeat (pTHX_ struct CoroSLF *frame) 1060slf_check_repeat (pTHX_ struct CoroSLF *frame)
894{ 1061{
895 return 1; 1062 return 1;
896} 1063}
897 1064
898static UNOP coro_setup_op; 1065static UNOP init_perl_op;
899 1066
900static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1067static void NOINLINE /* noinline to keep it out of the transfer fast path */
901coro_setup (pTHX_ struct coro *coro) 1068init_perl (pTHX_ struct coro *coro)
902{ 1069{
903 /* 1070 /*
904 * emulate part of the perl startup here. 1071 * emulate part of the perl startup here.
905 */ 1072 */
906 coro_init_stacks (aTHX); 1073 coro_init_stacks (aTHX);
… …
913 PL_comppad_name_fill = 0; 1080 PL_comppad_name_fill = 0;
914 PL_comppad_name_floor = 0; 1081 PL_comppad_name_floor = 0;
915 PL_curpm = 0; 1082 PL_curpm = 0;
916 PL_curpad = 0; 1083 PL_curpad = 0;
917 PL_localizing = 0; 1084 PL_localizing = 0;
918 PL_dirty = 0;
919 PL_restartop = 0; 1085 PL_restartop = 0;
920#if PERL_VERSION_ATLEAST (5,10,0) 1086#if PERL_VERSION_ATLEAST (5,10,0)
921 PL_parser = 0; 1087 PL_parser = 0;
922#endif 1088#endif
923 PL_hints = 0; 1089 PL_hints = 0;
924 1090
925 /* recreate the die/warn hooks */ 1091 /* recreate the die/warn hooks */
926 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1092 PL_diehook = SvREFCNT_inc (rv_diehook);
927 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1093 PL_warnhook = SvREFCNT_inc (rv_warnhook);
928 1094
929 GvSV (PL_defgv) = newSV (0); 1095 GvSV (PL_defgv) = newSV (0);
930 GvAV (PL_defgv) = coro->args; coro->args = 0; 1096 GvAV (PL_defgv) = coro->args; coro->args = 0;
931 GvSV (PL_errgv) = newSV (0); 1097 GvSV (PL_errgv) = newSV (0);
932 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1098 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
… …
953 /* this newly created coroutine might be run on an existing cctx which most 1119 /* this newly created coroutine might be run on an existing cctx which most
954 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1120 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
955 */ 1121 */
956 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1122 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
957 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1123 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
1124 slf_frame.destroy = 0;
958 1125
959 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1126 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
960 coro_setup_op.op_next = PL_op; 1127 init_perl_op.op_next = PL_op;
961 coro_setup_op.op_type = OP_ENTERSUB; 1128 init_perl_op.op_type = OP_ENTERSUB;
962 coro_setup_op.op_ppaddr = pp_slf; 1129 init_perl_op.op_ppaddr = pp_slf;
963 /* no flags etc. required, as an init function won't be called */ 1130 /* no flags etc. required, as an init function won't be called */
964 1131
965 PL_op = (OP *)&coro_setup_op; 1132 PL_op = (OP *)&init_perl_op;
966 1133
967 /* copy throw, in case it was set before coro_setup */ 1134 /* copy throw, in case it was set before init_perl */
968 CORO_THROW = coro->except; 1135 CORO_THROW = coro->except;
1136
1137 SWAP_SVS (coro);
1138
1139 if (expect_false (enable_times))
1140 {
1141 coro_times_update ();
1142 coro_times_sub (coro);
1143 }
969} 1144}
970 1145
971static void 1146static void
972coro_unwind_stacks (pTHX) 1147coro_unwind_stacks (pTHX)
973{ 1148{
… …
988 dounwind (-1); 1163 dounwind (-1);
989 } 1164 }
990} 1165}
991 1166
992static void 1167static void
993coro_destruct_perl (pTHX_ struct coro *coro) 1168destroy_perl (pTHX_ struct coro *coro)
994{ 1169{
1170 SV *svf [9];
1171
1172 {
1173 SV *old_current = SvRV (coro_current);
1174 struct coro *current = SvSTATE (old_current);
1175
1176 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1177
1178 save_perl (aTHX_ current);
1179
1180 /* this will cause transfer_check to croak on block*/
1181 SvRV_set (coro_current, (SV *)coro->hv);
1182
1183 load_perl (aTHX_ coro);
1184
995 coro_unwind_stacks (aTHX); 1185 coro_unwind_stacks (aTHX);
996 1186
997 SvREFCNT_dec (GvSV (PL_defgv)); 1187 /* restore swapped sv's */
998 SvREFCNT_dec (GvAV (PL_defgv)); 1188 SWAP_SVS (coro);
999 SvREFCNT_dec (GvSV (PL_errgv));
1000 SvREFCNT_dec (PL_defoutgv);
1001 SvREFCNT_dec (PL_rs);
1002 SvREFCNT_dec (GvSV (irsgv));
1003 SvREFCNT_dec (GvHV (PL_hintgv));
1004 1189
1005 SvREFCNT_dec (PL_diehook); 1190 coro_destruct_stacks (aTHX);
1006 SvREFCNT_dec (PL_warnhook); 1191
1192 // now save some sv's to be free'd later
1193 svf [0] = GvSV (PL_defgv);
1194 svf [1] = (SV *)GvAV (PL_defgv);
1195 svf [2] = GvSV (PL_errgv);
1196 svf [3] = (SV *)PL_defoutgv;
1197 svf [4] = PL_rs;
1198 svf [5] = GvSV (irsgv);
1199 svf [6] = (SV *)GvHV (PL_hintgv);
1200 svf [7] = PL_diehook;
1201 svf [8] = PL_warnhook;
1202 assert (9 == sizeof (svf) / sizeof (*svf));
1203
1204 SvRV_set (coro_current, old_current);
1205
1206 load_perl (aTHX_ current);
1007 1207 }
1208
1209 {
1210 unsigned int i;
1211
1212 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1213 SvREFCNT_dec (svf [i]);
1214
1008 SvREFCNT_dec (coro->saved_deffh); 1215 SvREFCNT_dec (coro->saved_deffh);
1009 SvREFCNT_dec (coro->rouse_cb); 1216 SvREFCNT_dec (coro->rouse_cb);
1010 SvREFCNT_dec (coro->invoke_cb); 1217 SvREFCNT_dec (coro->invoke_cb);
1011 SvREFCNT_dec (coro->invoke_av); 1218 SvREFCNT_dec (coro->invoke_av);
1012 1219 }
1013 coro_destruct_stacks (aTHX);
1014} 1220}
1015 1221
1016INLINE void 1222INLINE void
1017free_coro_mortal (pTHX) 1223free_coro_mortal (pTHX)
1018{ 1224{
1019 if (expect_true (coro_mortal)) 1225 if (expect_true (coro_mortal))
1020 { 1226 {
1021 SvREFCNT_dec (coro_mortal); 1227 SvREFCNT_dec ((SV *)coro_mortal);
1022 coro_mortal = 0; 1228 coro_mortal = 0;
1023 } 1229 }
1024} 1230}
1025 1231
1026static int 1232static int
… …
1215 /* somebody or something will hit me for both perl_run and PL_restartop */ 1421 /* somebody or something will hit me for both perl_run and PL_restartop */
1216 PL_restartop = PL_op; 1422 PL_restartop = PL_op;
1217 perl_run (PL_curinterp); 1423 perl_run (PL_curinterp);
1218 /* 1424 /*
1219 * Unfortunately, there is no way to get at the return values of the 1425 * Unfortunately, there is no way to get at the return values of the
1220 * coro body here, as perl_run destroys these 1426 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1427 * runtime errors here, as this is just a random interpreter, not a thread.
1221 */ 1428 */
1222 1429
1223 /* 1430 /*
1224 * If perl-run returns we assume exit() was being called or the coro 1431 * If perl-run returns we assume exit() was being called or the coro
1225 * fell off the end, which seems to be the only valid (non-bug) 1432 * fell off the end, which seems to be the only valid (non-bug)
… …
1312cctx_destroy (coro_cctx *cctx) 1519cctx_destroy (coro_cctx *cctx)
1313{ 1520{
1314 if (!cctx) 1521 if (!cctx)
1315 return; 1522 return;
1316 1523
1317 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1524 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1318 1525
1319 --cctx_count; 1526 --cctx_count;
1320 coro_destroy (&cctx->cctx); 1527 coro_destroy (&cctx->cctx);
1321 1528
1322 /* coro_transfer creates new, empty cctx's */ 1529 /* coro_transfer creates new, empty cctx's */
… …
1388 if (expect_true (prev != next)) 1595 if (expect_true (prev != next))
1389 { 1596 {
1390 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1597 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1391 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,"); 1598 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1392 1599
1393 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED))) 1600 if (expect_false (next->flags & (CF_RUNNING | CF_ZOMBIE | CF_SUSPENDED)))
1394 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,"); 1601 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1395 1602
1396#if !PERL_VERSION_ATLEAST (5,10,0) 1603#if !PERL_VERSION_ATLEAST (5,10,0)
1397 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1604 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1398 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1605 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
… …
1432 if (expect_false (next->flags & CF_NEW)) 1639 if (expect_false (next->flags & CF_NEW))
1433 { 1640 {
1434 /* need to start coroutine */ 1641 /* need to start coroutine */
1435 next->flags &= ~CF_NEW; 1642 next->flags &= ~CF_NEW;
1436 /* setup coroutine call */ 1643 /* setup coroutine call */
1437 coro_setup (aTHX_ next); 1644 init_perl (aTHX_ next);
1438 } 1645 }
1439 else 1646 else
1440 load_perl (aTHX_ next); 1647 load_perl (aTHX_ next);
1441 1648
1442 /* possibly untie and reuse the cctx */ 1649 /* possibly untie and reuse the cctx */
… …
1481#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1688#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1482#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1689#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1483 1690
1484/** high level stuff ********************************************************/ 1691/** high level stuff ********************************************************/
1485 1692
1693/* this function is actually Coro, not Coro::State, but we call it from here */
1694/* because it is convenient - but it hasn't been declared yet for that reason */
1486static int 1695static void
1696coro_call_on_destroy (pTHX_ struct coro *coro);
1697
1698static void
1487coro_state_destroy (pTHX_ struct coro *coro) 1699coro_state_destroy (pTHX_ struct coro *coro)
1488{ 1700{
1489 if (coro->flags & CF_DESTROYED) 1701 if (coro->flags & CF_ZOMBIE)
1490 return 0; 1702 return;
1491 1703
1492 if (coro->on_destroy && !PL_dirty)
1493 coro->on_destroy (aTHX_ coro); 1704 slf_destroy (aTHX_ coro);
1494 1705
1495 coro->flags |= CF_DESTROYED; 1706 coro->flags |= CF_ZOMBIE;
1496 1707
1497 if (coro->flags & CF_READY) 1708 if (coro->flags & CF_READY)
1498 { 1709 {
1499 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1710 /* reduce nready, as destroying a ready coro effectively unreadies it */
1500 /* alternative: look through all ready queues and remove the coro */ 1711 /* alternative: look through all ready queues and remove the coro */
1501 --coro_nready; 1712 --coro_nready;
1502 } 1713 }
1503 else 1714 else
1504 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1715 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1716
1717 if (coro->next) coro->next->prev = coro->prev;
1718 if (coro->prev) coro->prev->next = coro->next;
1719 if (coro == coro_first) coro_first = coro->next;
1505 1720
1506 if (coro->mainstack 1721 if (coro->mainstack
1507 && coro->mainstack != main_mainstack 1722 && coro->mainstack != main_mainstack
1508 && coro->slot 1723 && coro->slot
1509 && !PL_dirty) 1724 && !PL_dirty)
1510 {
1511 struct coro *current = SvSTATE_current;
1512
1513 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1514
1515 save_perl (aTHX_ current);
1516 load_perl (aTHX_ coro);
1517
1518 coro_destruct_perl (aTHX_ coro); 1725 destroy_perl (aTHX_ coro);
1519
1520 load_perl (aTHX_ current);
1521
1522 coro->slot = 0;
1523 }
1524 1726
1525 cctx_destroy (coro->cctx); 1727 cctx_destroy (coro->cctx);
1526 SvREFCNT_dec (coro->startcv); 1728 SvREFCNT_dec (coro->startcv);
1527 SvREFCNT_dec (coro->args); 1729 SvREFCNT_dec (coro->args);
1730 SvREFCNT_dec (coro->swap_sv);
1528 SvREFCNT_dec (CORO_THROW); 1731 SvREFCNT_dec (CORO_THROW);
1529 1732
1530 if (coro->next) coro->next->prev = coro->prev; 1733 coro_call_on_destroy (aTHX_ coro);
1531 if (coro->prev) coro->prev->next = coro->next;
1532 if (coro == coro_first) coro_first = coro->next;
1533 1734
1534 return 1; 1735 /* more destruction mayhem in coro_state_free */
1535} 1736}
1536 1737
1537static int 1738static int
1538coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1739coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1539{ 1740{
1540 struct coro *coro = (struct coro *)mg->mg_ptr; 1741 struct coro *coro = (struct coro *)mg->mg_ptr;
1541 mg->mg_ptr = 0; 1742 mg->mg_ptr = 0;
1542 1743
1543 coro->hv = 0;
1544
1545 if (--coro->refcnt < 0)
1546 {
1547 coro_state_destroy (aTHX_ coro); 1744 coro_state_destroy (aTHX_ coro);
1745 SvREFCNT_dec (coro->on_destroy);
1746 SvREFCNT_dec (coro->status);
1747
1548 Safefree (coro); 1748 Safefree (coro);
1549 }
1550 1749
1551 return 0; 1750 return 0;
1552} 1751}
1553 1752
1554static int 1753static int
1555coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1754coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1556{ 1755{
1557 struct coro *coro = (struct coro *)mg->mg_ptr; 1756 /* called when perl clones the current process the slow way (windows process emulation) */
1558 1757 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1559 ++coro->refcnt; 1758 mg->mg_ptr = 0;
1759 mg->mg_virtual = 0;
1560 1760
1561 return 0; 1761 return 0;
1562} 1762}
1563 1763
1564static MGVTBL coro_state_vtbl = { 1764static MGVTBL coro_state_vtbl = {
… …
1587 1787
1588 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1788 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1589 TRANSFER (ta, 1); 1789 TRANSFER (ta, 1);
1590} 1790}
1591 1791
1592/*****************************************************************************/
1593/* gensub: simple closure generation utility */
1594
1595#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1596
1597/* create a closure from XS, returns a code reference */
1598/* the arg can be accessed via GENSUB_ARG from the callback */
1599/* the callback must use dXSARGS/XSRETURN */
1600static SV *
1601gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1602{
1603 CV *cv = (CV *)newSV (0);
1604
1605 sv_upgrade ((SV *)cv, SVt_PVCV);
1606
1607 CvANON_on (cv);
1608 CvISXSUB_on (cv);
1609 CvXSUB (cv) = xsub;
1610 GENSUB_ARG = arg;
1611
1612 return newRV_noinc ((SV *)cv);
1613}
1614
1615/** Coro ********************************************************************/ 1792/** Coro ********************************************************************/
1616 1793
1617INLINE void 1794INLINE void
1618coro_enq (pTHX_ struct coro *coro) 1795coro_enq (pTHX_ struct coro *coro)
1619{ 1796{
1620 struct coro **ready = coro_ready [coro->prio - PRIO_MIN]; 1797 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1621 1798
1622 SvREFCNT_inc_NN (coro->hv); 1799 SvREFCNT_inc_NN (coro->hv);
1623 1800
1624 coro->next_ready = 0; 1801 coro->next_ready = 0;
1625 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro; 1802 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
… …
1629INLINE struct coro * 1806INLINE struct coro *
1630coro_deq (pTHX) 1807coro_deq (pTHX)
1631{ 1808{
1632 int prio; 1809 int prio;
1633 1810
1634 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1811 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1635 { 1812 {
1636 struct coro **ready = coro_ready [prio]; 1813 struct coro **ready = coro_ready [prio];
1637 1814
1638 if (ready [0]) 1815 if (ready [0])
1639 { 1816 {
… …
1644 } 1821 }
1645 1822
1646 return 0; 1823 return 0;
1647} 1824}
1648 1825
1826static void
1827invoke_sv_ready_hook_helper (void)
1828{
1829 dTHX;
1830 dSP;
1831
1832 ENTER;
1833 SAVETMPS;
1834
1835 PUSHMARK (SP);
1836 PUTBACK;
1837 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1838
1839 FREETMPS;
1840 LEAVE;
1841}
1842
1649static int 1843static int
1650api_ready (pTHX_ SV *coro_sv) 1844api_ready (pTHX_ SV *coro_sv)
1651{ 1845{
1652 struct coro *coro;
1653 SV *sv_hook;
1654 void (*xs_hook)(void);
1655
1656 coro = SvSTATE (coro_sv); 1846 struct coro *coro = SvSTATE (coro_sv);
1657 1847
1658 if (coro->flags & CF_READY) 1848 if (coro->flags & CF_READY)
1659 return 0; 1849 return 0;
1660 1850
1661 coro->flags |= CF_READY; 1851 coro->flags |= CF_READY;
1662 1852
1663 sv_hook = coro_nready ? 0 : coro_readyhook;
1664 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1665
1666 coro_enq (aTHX_ coro); 1853 coro_enq (aTHX_ coro);
1667 ++coro_nready;
1668 1854
1669 if (sv_hook) 1855 if (!coro_nready++)
1670 { 1856 if (coroapi.readyhook)
1671 dSP; 1857 coroapi.readyhook ();
1672
1673 ENTER;
1674 SAVETMPS;
1675
1676 PUSHMARK (SP);
1677 PUTBACK;
1678 call_sv (sv_hook, G_VOID | G_DISCARD);
1679
1680 FREETMPS;
1681 LEAVE;
1682 }
1683
1684 if (xs_hook)
1685 xs_hook ();
1686 1858
1687 return 1; 1859 return 1;
1688} 1860}
1689 1861
1690static int 1862static int
… …
1718 struct coro *next = coro_deq (aTHX); 1890 struct coro *next = coro_deq (aTHX);
1719 1891
1720 if (expect_true (next)) 1892 if (expect_true (next))
1721 { 1893 {
1722 /* cannot transfer to destroyed coros, skip and look for next */ 1894 /* cannot transfer to destroyed coros, skip and look for next */
1723 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED))) 1895 if (expect_false (next->flags & (CF_ZOMBIE | CF_SUSPENDED)))
1724 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */ 1896 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1725 else 1897 else
1726 { 1898 {
1727 next->flags &= ~CF_READY; 1899 next->flags &= ~CF_READY;
1728 --coro_nready; 1900 --coro_nready;
… …
1735 { 1907 {
1736 /* nothing to schedule: call the idle handler */ 1908 /* nothing to schedule: call the idle handler */
1737 if (SvROK (sv_idle) 1909 if (SvROK (sv_idle)
1738 && SvOBJECT (SvRV (sv_idle))) 1910 && SvOBJECT (SvRV (sv_idle)))
1739 { 1911 {
1912 if (SvRV (sv_idle) == SvRV (coro_current))
1913 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1914
1740 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1915 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1741 api_ready (aTHX_ SvRV (sv_idle)); 1916 api_ready (aTHX_ SvRV (sv_idle));
1742 --coro_nready; 1917 --coro_nready;
1743 } 1918 }
1744 else 1919 else
1745 { 1920 {
1921 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1746 dSP; 1922 dSP;
1747 1923
1748 ENTER; 1924 ENTER;
1749 SAVETMPS; 1925 SAVETMPS;
1750 1926
… …
1857 coro->slot->runops = RUNOPS_DEFAULT; 2033 coro->slot->runops = RUNOPS_DEFAULT;
1858 } 2034 }
1859} 2035}
1860 2036
1861static void 2037static void
2038coro_push_av (pTHX_ AV *av, I32 gimme_v)
2039{
2040 if (AvFILLp (av) >= 0 && gimme_v != G_VOID)
2041 {
2042 dSP;
2043
2044 if (gimme_v == G_SCALAR)
2045 XPUSHs (AvARRAY (av)[AvFILLp (av)]);
2046 else
2047 {
2048 int i;
2049 EXTEND (SP, AvFILLp (av) + 1);
2050
2051 for (i = 0; i <= AvFILLp (av); ++i)
2052 PUSHs (AvARRAY (av)[i]);
2053 }
2054
2055 PUTBACK;
2056 }
2057}
2058
2059static void
2060coro_push_on_destroy (pTHX_ struct coro *coro, SV *cb)
2061{
2062 if (!coro->on_destroy)
2063 coro->on_destroy = newAV ();
2064
2065 av_push (coro->on_destroy, cb);
2066}
2067
2068static void
2069slf_destroy_join (pTHX_ struct CoroSLF *frame)
2070{
2071 SvREFCNT_dec ((SV *)((struct coro *)frame->data)->hv);
2072}
2073
2074static int
2075slf_check_join (pTHX_ struct CoroSLF *frame)
2076{
2077 struct coro *coro = (struct coro *)frame->data;
2078
2079 if (!coro->status)
2080 return 1;
2081
2082 frame->destroy = 0;
2083
2084 coro_push_av (aTHX_ coro->status, GIMME_V);
2085
2086 SvREFCNT_dec ((SV *)coro->hv);
2087
2088 return 0;
2089}
2090
2091static void
2092slf_init_join (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093{
2094 struct coro *coro = SvSTATE (items > 0 ? arg [0] : &PL_sv_undef);
2095
2096 if (items > 1)
2097 croak ("join called with too many arguments");
2098
2099 if (coro->status)
2100 frame->prepare = prepare_nop;
2101 else
2102 {
2103 coro_push_on_destroy (aTHX_ coro, SvREFCNT_inc_NN (SvRV (coro_current)));
2104 frame->prepare = prepare_schedule;
2105 }
2106
2107 frame->check = slf_check_join;
2108 frame->destroy = slf_destroy_join;
2109 frame->data = (void *)coro;
2110 SvREFCNT_inc (coro->hv);
2111}
2112
2113static void
1862coro_call_on_destroy (pTHX_ struct coro *coro) 2114coro_call_on_destroy (pTHX_ struct coro *coro)
1863{ 2115{
1864 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2116 AV *od = coro->on_destroy;
1865 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1866 2117
1867 if (on_destroyp) 2118 if (!od)
1868 { 2119 return;
1869 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1870 2120
1871 while (AvFILLp (on_destroy) >= 0) 2121 while (AvFILLp (od) >= 0)
2122 {
2123 SV *cb = sv_2mortal (av_pop (od));
2124
2125 /* coro hv's (and only hv's at the moment) are supported as well */
2126 if (SvSTATEhv_p (aTHX_ cb))
2127 api_ready (aTHX_ cb);
2128 else
1872 { 2129 {
1873 dSP; /* don't disturb outer sp */ 2130 dSP; /* don't disturb outer sp */
1874 SV *cb = av_pop (on_destroy);
1875
1876 PUSHMARK (SP); 2131 PUSHMARK (SP);
1877 2132
1878 if (statusp) 2133 if (coro->status)
1879 { 2134 {
1880 int i; 2135 PUTBACK;
1881 AV *status = (AV *)SvRV (*statusp); 2136 coro_push_av (aTHX_ coro->status, G_ARRAY);
1882 EXTEND (SP, AvFILLp (status) + 1); 2137 SPAGAIN;
1883
1884 for (i = 0; i <= AvFILLp (status); ++i)
1885 PUSHs (AvARRAY (status)[i]);
1886 } 2138 }
1887 2139
1888 PUTBACK; 2140 PUTBACK;
1889 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2141 call_sv (cb, G_VOID | G_DISCARD);
1890 } 2142 }
1891 } 2143 }
1892} 2144}
1893 2145
1894static void 2146static void
1895slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2147coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1896{ 2148{
2149 AV *av;
2150
2151 if (coro->status)
2152 {
2153 av = coro->status;
2154 av_clear (av);
2155 }
2156 else
2157 av = coro->status = newAV ();
2158
2159 /* items are actually not so common, so optimise for this case */
2160 if (items)
2161 {
1897 int i; 2162 int i;
1898 HV *hv = (HV *)SvRV (coro_current);
1899 AV *av = newAV ();
1900 2163
1901 av_extend (av, items - 1); 2164 av_extend (av, items - 1);
2165
1902 for (i = 0; i < items; ++i) 2166 for (i = 0; i < items; ++i)
1903 av_push (av, SvREFCNT_inc_NN (arg [i])); 2167 av_push (av, SvREFCNT_inc_NN (arg [i]));
2168 }
2169}
1904 2170
1905 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2171static void
1906 2172slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2173{
1907 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2174 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1908 api_ready (aTHX_ sv_manager); 2175 api_ready (aTHX_ sv_manager);
1909 2176
1910 frame->prepare = prepare_schedule; 2177 frame->prepare = prepare_schedule;
1911 frame->check = slf_check_repeat; 2178 frame->check = slf_check_repeat;
1912 2179
1913 /* as a minor optimisation, we could unwind all stacks here */ 2180 /* as a minor optimisation, we could unwind all stacks here */
1914 /* but that puts extra pressure on pp_slf, and is not worth much */ 2181 /* but that puts extra pressure on pp_slf, and is not worth much */
1915 /*coro_unwind_stacks (aTHX);*/ 2182 /*coro_unwind_stacks (aTHX);*/
2183}
2184
2185static void
2186slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 HV *coro_hv = (HV *)SvRV (coro_current);
2189
2190 coro_set_status (aTHX_ SvSTATE ((SV *)coro_hv), arg, items);
2191 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2192}
2193
2194static void
2195slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2196{
2197 HV *coro_hv;
2198 struct coro *coro;
2199
2200 if (items <= 0)
2201 croak ("Coro::cancel called without coro object,");
2202
2203 coro = SvSTATE (arg [0]);
2204 coro_hv = coro->hv;
2205
2206 coro_set_status (aTHX_ coro, arg + 1, items - 1);
2207
2208 if (expect_false (coro->flags & CF_NOCANCEL))
2209 {
2210 /* coro currently busy cancelling something, so just notify it */
2211 coro->slf_frame.data = (void *)coro;
2212
2213 frame->prepare = prepare_nop;
2214 frame->check = slf_check_nop;
2215 }
2216 else if (coro_hv == (HV *)SvRV (coro_current))
2217 {
2218 /* cancelling the current coro is allowed, and equals terminate */
2219 slf_init_terminate_cancel_common (aTHX_ frame, coro_hv);
2220 }
2221 else
2222 {
2223 struct coro *self = SvSTATE_current;
2224
2225 /* otherwise we cancel directly, purely for speed reasons
2226 * unfortunately, this requires some magic trickery, as
2227 * somebody else could cancel us, so we have to fight the cancellation.
2228 * this is ugly, and hopefully fully worth the extra speed.
2229 * besides, I can't get the slow-but-safe version working...
2230 */
2231 slf_frame.data = 0;
2232 self->flags |= CF_NOCANCEL;
2233 coro_state_destroy (aTHX_ coro);
2234 self->flags &= ~CF_NOCANCEL;
2235
2236 if (slf_frame.data)
2237 {
2238 /* while we were busy we have been cancelled, so terminate */
2239 slf_init_terminate_cancel_common (aTHX_ frame, self->hv);
2240 }
2241 else
2242 {
2243 frame->prepare = prepare_nop;
2244 frame->check = slf_check_nop;
2245 }
2246 }
2247}
2248
2249static int
2250slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2251{
2252 frame->prepare = 0;
2253 coro_unwind_stacks (aTHX);
2254
2255 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2256
2257 return 1;
2258}
2259
2260static int
2261safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2262{
2263 if (coro->cctx)
2264 croak ("coro inside C callback, unable to cancel at this time, caught");
2265
2266 if (coro->flags & CF_NEW)
2267 {
2268 coro_set_status (aTHX_ coro, arg, items);
2269 coro_state_destroy (aTHX_ coro);
2270 }
2271 else
2272 {
2273 if (!coro->slf_frame.prepare)
2274 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2275
2276 slf_destroy (aTHX_ coro);
2277
2278 coro_set_status (aTHX_ coro, arg, items);
2279 coro->slf_frame.prepare = prepare_nop;
2280 coro->slf_frame.check = slf_check_safe_cancel;
2281
2282 api_ready (aTHX_ (SV *)coro->hv);
2283 }
2284
2285 return 1;
1916} 2286}
1917 2287
1918/*****************************************************************************/ 2288/*****************************************************************************/
1919/* async pool handler */ 2289/* async pool handler */
1920 2290
… …
1960 coro->saved_deffh = 0; 2330 coro->saved_deffh = 0;
1961 2331
1962 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2332 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1963 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2333 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1964 { 2334 {
1965 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2335 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1966 coro->invoke_av = newAV (); 2336 return;
1967
1968 frame->prepare = prepare_nop;
1969 } 2337 }
1970 else 2338 else
1971 { 2339 {
1972 av_clear (GvAV (PL_defgv)); 2340 av_clear (GvAV (PL_defgv));
1973 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2341 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1998 2366
1999static void 2367static void
2000coro_rouse_callback (pTHX_ CV *cv) 2368coro_rouse_callback (pTHX_ CV *cv)
2001{ 2369{
2002 dXSARGS; 2370 dXSARGS;
2003 SV *data = (SV *)GENSUB_ARG; 2371 SV *data = (SV *)S_GENSUB_ARG;
2004 2372
2005 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2373 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2006 { 2374 {
2007 /* first call, set args */ 2375 /* first call, set args */
2008 SV *coro = SvRV (data); 2376 SV *coro = SvRV (data);
… …
2074 || SvTYPE (SvRV (cb)) != SVt_PVCV 2442 || SvTYPE (SvRV (cb)) != SVt_PVCV
2075 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2443 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2076 croak ("Coro::rouse_wait called with illegal callback argument,"); 2444 croak ("Coro::rouse_wait called with illegal callback argument,");
2077 2445
2078 { 2446 {
2079 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2447 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2080 SV *data = (SV *)GENSUB_ARG; 2448 SV *data = (SV *)S_GENSUB_ARG;
2081 2449
2082 frame->data = (void *)data; 2450 frame->data = (void *)data;
2083 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2451 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2084 frame->check = slf_check_rouse_wait; 2452 frame->check = slf_check_rouse_wait;
2085 } 2453 }
… …
2089coro_new_rouse_cb (pTHX) 2457coro_new_rouse_cb (pTHX)
2090{ 2458{
2091 HV *hv = (HV *)SvRV (coro_current); 2459 HV *hv = (HV *)SvRV (coro_current);
2092 struct coro *coro = SvSTATE_hv (hv); 2460 struct coro *coro = SvSTATE_hv (hv);
2093 SV *data = newRV_inc ((SV *)hv); 2461 SV *data = newRV_inc ((SV *)hv);
2094 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2462 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2095 2463
2096 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2464 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2097 SvREFCNT_dec (data); /* magicext increases the refcount */ 2465 SvREFCNT_dec (data); /* magicext increases the refcount */
2098 2466
2099 SvREFCNT_dec (coro->rouse_cb); 2467 SvREFCNT_dec (coro->rouse_cb);
… …
2196static void 2564static void
2197slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2565slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2198{ 2566{
2199 frame->prepare = prepare_cede_notself; 2567 frame->prepare = prepare_cede_notself;
2200 frame->check = slf_check_nop; 2568 frame->check = slf_check_nop;
2569}
2570
2571/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2572static void
2573slf_destroy (pTHX_ struct coro *coro)
2574{
2575 /* this callback is reserved for slf functions needing to do cleanup */
2576 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2577 coro->slf_frame.destroy (aTHX_ &coro->slf_frame);
2578
2579 /*
2580 * The on_destroy above most likely is from an SLF call.
2581 * Since by definition the SLF call will not finish when we destroy
2582 * the coro, we will have to force-finish it here, otherwise
2583 * cleanup functions cannot call SLF functions.
2584 */
2585 coro->slf_frame.prepare = 0;
2201} 2586}
2202 2587
2203/* 2588/*
2204 * these not obviously related functions are all rolled into one 2589 * these not obviously related functions are all rolled into one
2205 * function to increase chances that they all will call transfer with the same 2590 * function to increase chances that they all will call transfer with the same
… …
2274 croak (0); 2659 croak (0);
2275 } 2660 }
2276 2661
2277 /* return value handling - mostly like entersub */ 2662 /* return value handling - mostly like entersub */
2278 /* make sure we put something on the stack in scalar context */ 2663 /* make sure we put something on the stack in scalar context */
2279 if (GIMME_V == G_SCALAR) 2664 if (GIMME_V == G_SCALAR
2665 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2280 { 2666 {
2281 dSP; 2667 dSP;
2282 SV **bot = PL_stack_base + checkmark; 2668 SV **bot = PL_stack_base + checkmark;
2283 2669
2284 if (sp == bot) /* too few, push undef */ 2670 if (sp == bot) /* too few, push undef */
2285 bot [1] = &PL_sv_undef; 2671 bot [1] = &PL_sv_undef;
2286 else if (sp != bot + 1) /* too many, take last one */ 2672 else /* too many, take last one */
2287 bot [1] = *sp; 2673 bot [1] = *sp;
2288 2674
2289 SP = bot + 1; 2675 SP = bot + 1;
2290 2676
2291 PUTBACK; 2677 PUTBACK;
… …
2324 if (PL_op->op_flags & OPf_STACKED) 2710 if (PL_op->op_flags & OPf_STACKED)
2325 { 2711 {
2326 if (items > slf_arga) 2712 if (items > slf_arga)
2327 { 2713 {
2328 slf_arga = items; 2714 slf_arga = items;
2329 free (slf_argv); 2715 Safefree (slf_argv);
2330 slf_argv = malloc (slf_arga * sizeof (SV *)); 2716 New (0, slf_argv, slf_arga, SV *);
2331 } 2717 }
2332 2718
2333 slf_argc = items; 2719 slf_argc = items;
2334 2720
2335 for (i = 0; i < items; ++i) 2721 for (i = 0; i < items; ++i)
… …
2470/* Coro::Semaphore & Coro::Signal */ 2856/* Coro::Semaphore & Coro::Signal */
2471 2857
2472static SV * 2858static SV *
2473coro_waitarray_new (pTHX_ int count) 2859coro_waitarray_new (pTHX_ int count)
2474{ 2860{
2475 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2861 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2476 AV *av = newAV (); 2862 AV *av = newAV ();
2477 SV **ary; 2863 SV **ary;
2478 2864
2479 /* unfortunately, building manually saves memory */ 2865 /* unfortunately, building manually saves memory */
2480 Newx (ary, 2, SV *); 2866 Newx (ary, 2, SV *);
… …
2531 SvREFCNT_dec (cb); 2917 SvREFCNT_dec (cb);
2532 } 2918 }
2533} 2919}
2534 2920
2535static void 2921static void
2536coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2922coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2537{ 2923{
2538 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2924 /* call $sem->adjust (0) to possibly wake up some other waiters */
2539 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2925 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2540} 2926}
2541 2927
2542static int 2928static int
2543slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2929slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2544{ 2930{
2545 AV *av = (AV *)frame->data; 2931 AV *av = (AV *)frame->data;
2546 SV *count_sv = AvARRAY (av)[0]; 2932 SV *count_sv = AvARRAY (av)[0];
2933 SV *coro_hv = SvRV (coro_current);
2547 2934
2548 /* if we are about to throw, don't actually acquire the lock, just throw */ 2935 /* if we are about to throw, don't actually acquire the lock, just throw */
2549 if (CORO_THROW) 2936 if (CORO_THROW)
2550 return 0; 2937 return 0;
2551 else if (SvIVX (count_sv) > 0) 2938 else if (SvIVX (count_sv) > 0)
2552 { 2939 {
2553 SvSTATE_current->on_destroy = 0; 2940 frame->destroy = 0;
2554 2941
2555 if (acquire) 2942 if (acquire)
2556 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2943 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2557 else 2944 else
2558 coro_semaphore_adjust (aTHX_ av, 0); 2945 coro_semaphore_adjust (aTHX_ av, 0);
… …
2563 { 2950 {
2564 int i; 2951 int i;
2565 /* if we were woken up but can't down, we look through the whole */ 2952 /* if we were woken up but can't down, we look through the whole */
2566 /* waiters list and only add us if we aren't in there already */ 2953 /* waiters list and only add us if we aren't in there already */
2567 /* this avoids some degenerate memory usage cases */ 2954 /* this avoids some degenerate memory usage cases */
2568 2955 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2569 for (i = 1; i <= AvFILLp (av); ++i)
2570 if (AvARRAY (av)[i] == SvRV (coro_current)) 2956 if (AvARRAY (av)[i] == coro_hv)
2571 return 1; 2957 return 1;
2572 2958
2573 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2959 av_push (av, SvREFCNT_inc (coro_hv));
2574 return 1; 2960 return 1;
2575 } 2961 }
2576} 2962}
2577 2963
2578static int 2964static int
… …
2601 { 2987 {
2602 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2988 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2603 2989
2604 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2990 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2605 frame->prepare = prepare_schedule; 2991 frame->prepare = prepare_schedule;
2606
2607 /* to avoid race conditions when a woken-up coro gets terminated */ 2992 /* to avoid race conditions when a woken-up coro gets terminated */
2608 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2993 /* we arrange for a temporary on_destroy that calls adjust (0) */
2609 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2994 frame->destroy = coro_semaphore_destroy;
2610 } 2995 }
2611} 2996}
2612 2997
2613static void 2998static void
2614slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2999slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2622{ 3007{
2623 if (items >= 2) 3008 if (items >= 2)
2624 { 3009 {
2625 /* callback form */ 3010 /* callback form */
2626 AV *av = (AV *)SvRV (arg [0]); 3011 AV *av = (AV *)SvRV (arg [0]);
2627 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3012 SV *cb_cv = s_get_cv_croak (arg [1]);
2628 3013
2629 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3014 av_push (av, SvREFCNT_inc_NN (cb_cv));
2630 3015
2631 if (SvIVX (AvARRAY (av)[0]) > 0) 3016 if (SvIVX (AvARRAY (av)[0]) > 0)
2632 coro_semaphore_adjust (aTHX_ av, 0); 3017 coro_semaphore_adjust (aTHX_ av, 0);
2633 3018
2634 frame->prepare = prepare_nop; 3019 frame->prepare = prepare_nop;
… …
2658 AvARRAY (av)[0] = AvARRAY (av)[1]; 3043 AvARRAY (av)[0] = AvARRAY (av)[1];
2659 AvARRAY (av)[1] = cb; 3044 AvARRAY (av)[1] = cb;
2660 3045
2661 cb = av_shift (av); 3046 cb = av_shift (av);
2662 3047
3048 if (SvTYPE (cb) == SVt_PVCV)
3049 {
3050 dSP;
3051 PUSHMARK (SP);
3052 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
3053 PUTBACK;
3054 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
3055 }
3056 else
3057 {
2663 api_ready (aTHX_ cb); 3058 api_ready (aTHX_ cb);
2664 sv_setiv (cb, 0); /* signal waiter */ 3059 sv_setiv (cb, 0); /* signal waiter */
3060 }
3061
2665 SvREFCNT_dec (cb); 3062 SvREFCNT_dec (cb);
2666 3063
2667 --count; 3064 --count;
2668 } 3065 }
2669} 3066}
… …
2678static void 3075static void
2679slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 3076slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2680{ 3077{
2681 AV *av = (AV *)SvRV (arg [0]); 3078 AV *av = (AV *)SvRV (arg [0]);
2682 3079
3080 if (items >= 2)
3081 {
3082 SV *cb_cv = s_get_cv_croak (arg [1]);
3083 av_push (av, SvREFCNT_inc_NN (cb_cv));
3084
2683 if (SvIVX (AvARRAY (av)[0])) 3085 if (SvIVX (AvARRAY (av)[0]))
3086 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
3087
3088 frame->prepare = prepare_nop;
3089 frame->check = slf_check_nop;
3090 }
3091 else if (SvIVX (AvARRAY (av)[0]))
2684 { 3092 {
2685 SvIVX (AvARRAY (av)[0]) = 0; 3093 SvIVX (AvARRAY (av)[0]) = 0;
2686 frame->prepare = prepare_nop; 3094 frame->prepare = prepare_nop;
2687 frame->check = slf_check_nop; 3095 frame->check = slf_check_nop;
2688 } 3096 }
2689 else 3097 else
2690 { 3098 {
2691 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3099 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2692 3100
2693 av_push (av, waiter); 3101 av_push (av, waiter);
2694 3102
2695 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3103 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2696 frame->prepare = prepare_schedule; 3104 frame->prepare = prepare_schedule;
… …
2714 3122
2715static void 3123static void
2716coro_aio_callback (pTHX_ CV *cv) 3124coro_aio_callback (pTHX_ CV *cv)
2717{ 3125{
2718 dXSARGS; 3126 dXSARGS;
2719 AV *state = (AV *)GENSUB_ARG; 3127 AV *state = (AV *)S_GENSUB_ARG;
2720 SV *coro = av_pop (state); 3128 SV *coro = av_pop (state);
2721 SV *data_sv = newSV (sizeof (struct io_state)); 3129 SV *data_sv = newSV (sizeof (struct io_state));
2722 3130
2723 av_extend (state, items - 1); 3131 av_extend (state, items - 1);
2724 3132
… …
2838 3246
2839 for (i = 0; i < items; ++i) 3247 for (i = 0; i < items; ++i)
2840 PUSHs (arg [i]); 3248 PUSHs (arg [i]);
2841 3249
2842 /* now push the callback closure */ 3250 /* now push the callback closure */
2843 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3251 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2844 3252
2845 /* now call the AIO function - we assume our request is uncancelable */ 3253 /* now call the AIO function - we assume our request is uncancelable */
2846 PUTBACK; 3254 PUTBACK;
2847 call_sv ((SV *)req, G_VOID | G_DISCARD); 3255 call_sv ((SV *)req, G_VOID | G_DISCARD);
2848 } 3256 }
2849 3257
2850 /* now that the requets is going, we loop toll we have a result */ 3258 /* now that the request is going, we loop till we have a result */
2851 frame->data = (void *)state; 3259 frame->data = (void *)state;
2852 frame->prepare = prepare_schedule; 3260 frame->prepare = prepare_schedule;
2853 frame->check = slf_check_aio_req; 3261 frame->check = slf_check_aio_req;
2854} 3262}
2855 3263
… …
2866/*****************************************************************************/ 3274/*****************************************************************************/
2867 3275
2868#if CORO_CLONE 3276#if CORO_CLONE
2869# include "clone.c" 3277# include "clone.c"
2870#endif 3278#endif
3279
3280/*****************************************************************************/
3281
3282static SV *
3283coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3284{
3285 SV *coro_sv;
3286 struct coro *coro;
3287 MAGIC *mg;
3288 HV *hv;
3289 SV *cb;
3290 int i;
3291
3292 if (argc > 0)
3293 {
3294 cb = s_get_cv_croak (argv [0]);
3295
3296 if (!is_coro)
3297 {
3298 if (CvISXSUB (cb))
3299 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3300
3301 if (!CvROOT (cb))
3302 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3303 }
3304 }
3305
3306 Newz (0, coro, 1, struct coro);
3307 coro->args = newAV ();
3308 coro->flags = CF_NEW;
3309
3310 if (coro_first) coro_first->prev = coro;
3311 coro->next = coro_first;
3312 coro_first = coro;
3313
3314 coro->hv = hv = newHV ();
3315 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3316 mg->mg_flags |= MGf_DUP;
3317 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3318
3319 if (argc > 0)
3320 {
3321 av_extend (coro->args, argc + is_coro - 1);
3322
3323 if (is_coro)
3324 {
3325 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3326 cb = (SV *)cv_coro_run;
3327 }
3328
3329 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3330
3331 for (i = 1; i < argc; i++)
3332 av_push (coro->args, newSVsv (argv [i]));
3333 }
3334
3335 return coro_sv;
3336}
2871 3337
2872MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3338MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2873 3339
2874PROTOTYPES: DISABLE 3340PROTOTYPES: DISABLE
2875 3341
… …
2928 coroapi.prepare_nop = prepare_nop; 3394 coroapi.prepare_nop = prepare_nop;
2929 coroapi.prepare_schedule = prepare_schedule; 3395 coroapi.prepare_schedule = prepare_schedule;
2930 coroapi.prepare_cede = prepare_cede; 3396 coroapi.prepare_cede = prepare_cede;
2931 coroapi.prepare_cede_notself = prepare_cede_notself; 3397 coroapi.prepare_cede_notself = prepare_cede_notself;
2932 3398
2933 { 3399 time_init (aTHX);
2934 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2935 3400
2936 if (!svp) croak ("Time::HiRes is required");
2937 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2938
2939 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2940 }
2941
2942 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3401 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2943} 3402}
2944 3403
2945SV * 3404SV *
2946new (char *klass, ...) 3405new (SV *klass, ...)
2947 ALIAS: 3406 ALIAS:
2948 Coro::new = 1 3407 Coro::new = 1
2949 CODE: 3408 CODE:
2950{ 3409 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2951 struct coro *coro; 3410 OUTPUT:
2952 MAGIC *mg;
2953 HV *hv;
2954 CV *cb;
2955 int i;
2956
2957 if (items > 1)
2958 {
2959 cb = coro_sv_2cv (aTHX_ ST (1));
2960
2961 if (!ix)
2962 {
2963 if (CvISXSUB (cb))
2964 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2965
2966 if (!CvROOT (cb))
2967 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2968 }
2969 }
2970
2971 Newz (0, coro, 1, struct coro);
2972 coro->args = newAV ();
2973 coro->flags = CF_NEW;
2974
2975 if (coro_first) coro_first->prev = coro;
2976 coro->next = coro_first;
2977 coro_first = coro;
2978
2979 coro->hv = hv = newHV ();
2980 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2981 mg->mg_flags |= MGf_DUP;
2982 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2983
2984 if (items > 1)
2985 {
2986 av_extend (coro->args, items - 1 + ix - 1);
2987
2988 if (ix)
2989 {
2990 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2991 cb = cv_coro_run;
2992 }
2993
2994 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2995
2996 for (i = 2; i < items; i++)
2997 av_push (coro->args, newSVsv (ST (i)));
2998 }
2999}
3000 OUTPUT:
3001 RETVAL 3411 RETVAL
3002 3412
3003void 3413void
3004transfer (...) 3414transfer (...)
3005 PROTOTYPE: $$ 3415 PROTOTYPE: $$
3006 CODE: 3416 CODE:
3007 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3417 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3008
3009bool
3010_destroy (SV *coro_sv)
3011 CODE:
3012 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3013 OUTPUT:
3014 RETVAL
3015 3418
3016void 3419void
3017_exit (int code) 3420_exit (int code)
3018 PROTOTYPE: $ 3421 PROTOTYPE: $
3019 CODE: 3422 CODE:
… …
3095 CODE: 3498 CODE:
3096{ 3499{
3097 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3500 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3098 { 3501 {
3099 struct coro *current = SvSTATE_current; 3502 struct coro *current = SvSTATE_current;
3503 struct CoroSLF slf_save;
3100 3504
3101 if (current != coro) 3505 if (current != coro)
3102 { 3506 {
3103 PUTBACK; 3507 PUTBACK;
3104 save_perl (aTHX_ current); 3508 save_perl (aTHX_ current);
3105 load_perl (aTHX_ coro); 3509 load_perl (aTHX_ coro);
3510 /* the coro is most likely in an active SLF call.
3511 * while not strictly required (the code we execute is
3512 * not allowed to call any SLF functions), it's cleaner
3513 * to reinitialise the slf_frame and restore it later.
3514 * This might one day allow us to actually do SLF calls
3515 * from code executed here.
3516 */
3517 slf_save = slf_frame;
3518 slf_frame.prepare = 0;
3106 SPAGAIN; 3519 SPAGAIN;
3107 } 3520 }
3108 3521
3109 PUSHSTACK; 3522 PUSHSTACK;
3110 3523
… …
3120 SPAGAIN; 3533 SPAGAIN;
3121 3534
3122 if (current != coro) 3535 if (current != coro)
3123 { 3536 {
3124 PUTBACK; 3537 PUTBACK;
3538 slf_frame = slf_save;
3125 save_perl (aTHX_ coro); 3539 save_perl (aTHX_ coro);
3126 load_perl (aTHX_ current); 3540 load_perl (aTHX_ current);
3127 SPAGAIN; 3541 SPAGAIN;
3128 } 3542 }
3129 } 3543 }
… …
3134 PROTOTYPE: $ 3548 PROTOTYPE: $
3135 ALIAS: 3549 ALIAS:
3136 is_ready = CF_READY 3550 is_ready = CF_READY
3137 is_running = CF_RUNNING 3551 is_running = CF_RUNNING
3138 is_new = CF_NEW 3552 is_new = CF_NEW
3139 is_destroyed = CF_DESTROYED 3553 is_destroyed = CF_ZOMBIE
3554 is_zombie = CF_ZOMBIE
3140 is_suspended = CF_SUSPENDED 3555 is_suspended = CF_SUSPENDED
3141 CODE: 3556 CODE:
3142 RETVAL = boolSV (coro->flags & ix); 3557 RETVAL = boolSV (coro->flags & ix);
3143 OUTPUT: 3558 OUTPUT:
3144 RETVAL 3559 RETVAL
3145 3560
3146void 3561void
3147throw (Coro::State self, SV *throw = &PL_sv_undef) 3562throw (Coro::State self, SV *exception = &PL_sv_undef)
3148 PROTOTYPE: $;$ 3563 PROTOTYPE: $;$
3149 CODE: 3564 CODE:
3150{ 3565{
3151 struct coro *current = SvSTATE_current; 3566 struct coro *current = SvSTATE_current;
3152 SV **throwp = self == current ? &CORO_THROW : &self->except; 3567 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3153 SvREFCNT_dec (*throwp); 3568 SvREFCNT_dec (*exceptionp);
3154 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3569 SvGETMAGIC (exception);
3570 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3155} 3571}
3156 3572
3157void 3573void
3158api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3574api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3159 PROTOTYPE: $;$ 3575 PROTOTYPE: $;$
… …
3214 3630
3215void 3631void
3216cancel (Coro::State self) 3632cancel (Coro::State self)
3217 CODE: 3633 CODE:
3218 coro_state_destroy (aTHX_ self); 3634 coro_state_destroy (aTHX_ self);
3219 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */ 3635
3636SV *
3637enable_times (int enabled = enable_times)
3638 CODE:
3639{
3640 RETVAL = boolSV (enable_times);
3641
3642 if (enabled != enable_times)
3643 {
3644 enable_times = enabled;
3645
3646 coro_times_update ();
3647 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3648 }
3649}
3650 OUTPUT:
3651 RETVAL
3652
3653void
3654times (Coro::State self)
3655 PPCODE:
3656{
3657 struct coro *current = SvSTATE (coro_current);
3658
3659 if (expect_false (current == self))
3660 {
3661 coro_times_update ();
3662 coro_times_add (SvSTATE (coro_current));
3663 }
3664
3665 EXTEND (SP, 2);
3666 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3667 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3668
3669 if (expect_false (current == self))
3670 coro_times_sub (SvSTATE (coro_current));
3671}
3672
3673void
3674swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3675 CODE:
3676{
3677 struct coro *current = SvSTATE_current;
3678
3679 if (current == coro)
3680 SWAP_SVS (current);
3681
3682 if (!coro->swap_sv)
3683 coro->swap_sv = newAV ();
3684
3685 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3686 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3687
3688 if (current == coro)
3689 SWAP_SVS (current);
3690}
3220 3691
3221 3692
3222MODULE = Coro::State PACKAGE = Coro 3693MODULE = Coro::State PACKAGE = Coro
3223 3694
3224BOOT: 3695BOOT:
3225{ 3696{
3226 int i;
3227
3228 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3697 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3229 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3698 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3230 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3699 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3231 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3232 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3700 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3233 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3701 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3234 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3702 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3235 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3703 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3236 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3704 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3237 3705
3238 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3706 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3239 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3707 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3240 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3708 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3241 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3709 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3242 3710
3243 coro_stash = gv_stashpv ("Coro", TRUE); 3711 coro_stash = gv_stashpv ("Coro", TRUE);
3244 3712
3245 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3713 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3246 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3714 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3247 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3715 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3248 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3716 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3249 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3717 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3250 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3718 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3251 3719
3252 { 3720 {
3253 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3721 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3254 3722
3255 coroapi.schedule = api_schedule; 3723 coroapi.schedule = api_schedule;
… …
3265 sv_setiv (sv, (IV)&coroapi); 3733 sv_setiv (sv, (IV)&coroapi);
3266 SvREADONLY_on (sv); 3734 SvREADONLY_on (sv);
3267 } 3735 }
3268} 3736}
3269 3737
3738SV *
3739async (...)
3740 PROTOTYPE: &@
3741 CODE:
3742 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3743 api_ready (aTHX_ RETVAL);
3744 OUTPUT:
3745 RETVAL
3746
3747void
3748_destroy (Coro::State coro)
3749 CODE:
3750 /* used by the manager thread */
3751 coro_state_destroy (aTHX_ coro);
3752
3753void
3754on_destroy (Coro::State coro, SV *cb)
3755 CODE:
3756 coro_push_on_destroy (aTHX_ coro, newSVsv (cb));
3757
3758void
3759join (...)
3760 CODE:
3761 CORO_EXECUTE_SLF_XS (slf_init_join);
3762
3270void 3763void
3271terminate (...) 3764terminate (...)
3272 CODE: 3765 CODE:
3273 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3766 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3767
3768void
3769cancel (...)
3770 CODE:
3771 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3772
3773int
3774safe_cancel (Coro::State self, ...)
3775 C_ARGS: aTHX_ self, &ST (1), items - 1
3274 3776
3275void 3777void
3276schedule (...) 3778schedule (...)
3277 CODE: 3779 CODE:
3278 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3780 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3307void 3809void
3308_set_readyhook (SV *hook) 3810_set_readyhook (SV *hook)
3309 PROTOTYPE: $ 3811 PROTOTYPE: $
3310 CODE: 3812 CODE:
3311 SvREFCNT_dec (coro_readyhook); 3813 SvREFCNT_dec (coro_readyhook);
3814 SvGETMAGIC (hook);
3815 if (SvOK (hook))
3816 {
3312 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3817 coro_readyhook = newSVsv (hook);
3818 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3819 }
3820 else
3821 {
3822 coro_readyhook = 0;
3823 CORO_READYHOOK = 0;
3824 }
3313 3825
3314int 3826int
3315prio (Coro::State coro, int newprio = 0) 3827prio (Coro::State coro, int newprio = 0)
3316 PROTOTYPE: $;$ 3828 PROTOTYPE: $;$
3317 ALIAS: 3829 ALIAS:
… …
3323 if (items > 1) 3835 if (items > 1)
3324 { 3836 {
3325 if (ix) 3837 if (ix)
3326 newprio = coro->prio - newprio; 3838 newprio = coro->prio - newprio;
3327 3839
3328 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3840 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3329 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3841 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3330 3842
3331 coro->prio = newprio; 3843 coro->prio = newprio;
3332 } 3844 }
3333} 3845}
3334 OUTPUT: 3846 OUTPUT:
… …
3381 for (i = 1; i < items; ++i) 3893 for (i = 1; i < items; ++i)
3382 av_push (av, SvREFCNT_inc_NN (ST (i))); 3894 av_push (av, SvREFCNT_inc_NN (ST (i)));
3383 3895
3384 if ((SV *)hv == &PL_sv_undef) 3896 if ((SV *)hv == &PL_sv_undef)
3385 { 3897 {
3386 PUSHMARK (SP); 3898 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3387 EXTEND (SP, 2);
3388 PUSHs (sv_Coro);
3389 PUSHs ((SV *)cv_pool_handler);
3390 PUTBACK;
3391 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3392 SPAGAIN;
3393
3394 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3899 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3900 SvREFCNT_dec (sv);
3395 } 3901 }
3396 3902
3397 { 3903 {
3398 struct coro *coro = SvSTATE_hv (hv); 3904 struct coro *coro = SvSTATE_hv (hv);
3399 3905
… …
3433 CODE: 3939 CODE:
3434{ 3940{
3435 struct coro *coro = SvSTATE_current; 3941 struct coro *coro = SvSTATE_current;
3436 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3942 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3437 3943
3438 block = (SV *)coro_sv_2cv (aTHX_ block); 3944 block = s_get_cv_croak (block);
3439 3945
3440 if (!*avp) 3946 if (!*avp)
3441 *avp = newAV (); 3947 *avp = newAV ();
3442 3948
3443 av_push (*avp, SvREFCNT_inc (block)); 3949 av_push (*avp, SvREFCNT_inc (block));
… …
3460MODULE = Coro::State PACKAGE = Coro::Semaphore 3966MODULE = Coro::State PACKAGE = Coro::Semaphore
3461 3967
3462SV * 3968SV *
3463new (SV *klass, SV *count = 0) 3969new (SV *klass, SV *count = 0)
3464 CODE: 3970 CODE:
3971{
3972 int semcnt = 1;
3973
3974 if (count)
3975 {
3976 SvGETMAGIC (count);
3977
3978 if (SvOK (count))
3979 semcnt = SvIV (count);
3980 }
3981
3465 RETVAL = sv_bless ( 3982 RETVAL = sv_bless (
3466 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3983 coro_waitarray_new (aTHX_ semcnt),
3467 GvSTASH (CvGV (cv)) 3984 GvSTASH (CvGV (cv))
3468 ); 3985 );
3986}
3469 OUTPUT: 3987 OUTPUT:
3470 RETVAL 3988 RETVAL
3471 3989
3472# helper for Coro::Channel and others 3990# helper for Coro::Channel and others
3473SV * 3991SV *
… …
3631 4149
3632void 4150void
3633_register (char *target, char *proto, SV *req) 4151_register (char *target, char *proto, SV *req)
3634 CODE: 4152 CODE:
3635{ 4153{
3636 CV *req_cv = coro_sv_2cv (aTHX_ req); 4154 SV *req_cv = s_get_cv_croak (req);
3637 /* newXSproto doesn't return the CV on 5.8 */ 4155 /* newXSproto doesn't return the CV on 5.8 */
3638 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4156 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3639 sv_setpv ((SV *)slf_cv, proto); 4157 sv_setpv ((SV *)slf_cv, proto);
3640 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4158 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3641} 4159}
3642 4160
4161MODULE = Coro::State PACKAGE = Coro::Select
4162
4163void
4164patch_pp_sselect ()
4165 CODE:
4166 if (!coro_old_pp_sselect)
4167 {
4168 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4169 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4170 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4171 }
4172
4173void
4174unpatch_pp_sselect ()
4175 CODE:
4176 if (coro_old_pp_sselect)
4177 {
4178 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4179 coro_old_pp_sselect = 0;
4180 }
4181

Diff Legend

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