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

Diff Legend

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