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.340 by root, Mon Dec 15 00:30:40 2008 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 */
215 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
216 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
243}; 217};
244 218
245/* 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 */
246typedef struct 220typedef struct
247{ 221{
… …
253#define VAR(name,type) type name; 227#define VAR(name,type) type name;
254# include "state.h" 228# include "state.h"
255#undef VAR 229#undef VAR
256} perl_slots; 230} perl_slots;
257 231
232// how many context stack entries do we need for perl_slots
258#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))
259 234
260/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
261struct coro { 236struct coro
237{
262 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 239 coro_cctx *cctx;
240
241 /* ready queue */
242 struct coro *next_ready;
264 243
265 /* state data */ 244 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 246 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
269 248
270 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
271 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
272 int refcnt; /* coroutines are refcounted, yes */
273 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
274 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
275 void (*on_destroy)(pTHX_ struct coro *coro);
276 253
277 /* statistics */ 254 /* statistics */
278 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
279 256
280 /* coro process data */ 257 /* coro process data */
281 int prio; 258 int prio;
282 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
283 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 */
284 263
285 /* async_pool */ 264 /* async_pool */
286 SV *saved_deffh; 265 SV *saved_deffh;
287 SV *invoke_cb; 266 SV *invoke_cb;
288 AV *invoke_av; 267 AV *invoke_av;
289 268
290 /* on_enter/on_leave */ 269 /* on_enter/on_leave */
291 AV *on_enter; 270 AV *on_enter;
292 AV *on_leave; 271 AV *on_leave;
293 272
273 /* swap_sv */
274 AV *swap_sv;
275
276 /* times */
277 coro_ts t_cpu, t_real;
278
294 /* linked list */ 279 /* linked list */
295 struct coro *next, *prev; 280 struct coro *next, *prev;
296}; 281};
297 282
298typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
299typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
300 285
301/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
302/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
303/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
304static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
305 290
306/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
307 292
308#define PRIO_MAX 3 293#define CORO_PRIO_MAX 3
309#define PRIO_HIGH 1 294#define CORO_PRIO_HIGH 1
310#define PRIO_NORMAL 0 295#define CORO_PRIO_NORMAL 0
311#define PRIO_LOW -1 296#define CORO_PRIO_LOW -1
312#define PRIO_IDLE -3 297#define CORO_PRIO_IDLE -3
313#define PRIO_MIN -4 298#define CORO_PRIO_MIN -4
314 299
315/* for Coro.pm */ 300/* for Coro.pm */
316static SV *coro_current; 301static SV *coro_current;
317static SV *coro_readyhook; 302static SV *coro_readyhook;
318static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
319static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
320static struct coro *coro_first; 305static struct coro *coro_first;
321#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
322 379
323/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
324 381
325static SV * 382static SV *
326coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
… …
350 get_hv (name, create); 407 get_hv (name, create);
351#endif 408#endif
352 return get_hv (name, create); 409 return get_hv (name, create);
353} 410}
354 411
355/* may croak */ 412INLINE void
356INLINE CV * 413coro_times_update ()
357coro_sv_2cv (pTHX_ SV *sv)
358{ 414{
359 HV *st; 415#ifdef coro_clock_gettime
360 GV *gvp; 416 struct timespec ts;
361 CV *cv = sv_2cv (sv, &st, &gvp, 0);
362 417
363 if (!cv) 418 ts.tv_sec = ts.tv_nsec = 0;
364 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;
365 421
366 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];
367} 457}
368 458
369/*****************************************************************************/ 459/*****************************************************************************/
370/* magic glue */ 460/* magic glue */
371 461
… …
383 : 0) 473 : 0)
384 474
385#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)
386#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)
387 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
388INLINE struct coro * 493INLINE struct coro *
389SvSTATE_ (pTHX_ SV *coro) 494SvSTATE_ (pTHX_ SV *coro)
390{ 495{
391 HV *stash;
392 MAGIC *mg; 496 MAGIC *mg;
393 497
394 if (SvROK (coro)) 498 if (SvROK (coro))
395 coro = SvRV (coro); 499 coro = SvRV (coro);
396 500
397 if (expect_false (SvTYPE (coro) != SVt_PVHV)) 501 mg = SvSTATEhv_p (coro);
502 if (!mg)
398 croak ("Coro::State object required"); 503 croak ("Coro::State object required");
399 504
400 stash = SvSTASH (coro);
401 if (expect_false (stash != coro_stash && stash != coro_state_stash))
402 {
403 /* very slow, but rare, check */
404 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
405 croak ("Coro::State object required");
406 }
407
408 mg = CORO_MAGIC_state (coro);
409 return (struct coro *)mg->mg_ptr; 505 return (struct coro *)mg->mg_ptr;
410} 506}
411 507
412#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 508#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
413 509
… …
471static int 567static int
472coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 568coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
473{ 569{
474 AV *padlist; 570 AV *padlist;
475 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;
476 576
477 /* casting is fun. */ 577 /* casting is fun. */
478 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 578 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
479 free_padlist (aTHX_ padlist); 579 free_padlist (aTHX_ padlist);
480 580
… …
529 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
530} 630}
531 631
532/** load & save, init *******************************************************/ 632/** load & save, init *******************************************************/
533 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
534static void 685static void
535on_enterleave_call (pTHX_ SV *cb); 686on_enterleave_call (pTHX_ SV *cb);
536 687
537static void 688static void
538load_perl (pTHX_ Coro__State c) 689load_perl (pTHX_ Coro__State c)
… …
569 } 720 }
570 721
571 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
572 CORO_THROW = c->except; 723 CORO_THROW = c->except;
573 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
574 if (expect_false (c->on_enter)) 733 if (expect_false (c->on_enter))
575 { 734 {
576 int i; 735 int i;
577 736
578 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 737 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
579 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 738 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
580 } 739 }
740
741 SWAP_SVS (c);
581} 742}
582 743
583static void 744static void
584save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
585{ 746{
747 SWAP_SVS (c);
748
586 if (expect_false (c->on_leave)) 749 if (expect_false (c->on_leave))
587 { 750 {
588 int i; 751 int i;
589 752
590 for (i = AvFILLp (c->on_leave); i >= 0; --i) 753 for (i = AvFILLp (c->on_leave); i >= 0; --i)
591 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);
592 } 763 }
593 764
594 c->except = CORO_THROW; 765 c->except = CORO_THROW;
595 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
596 767
… …
611 { 782 {
612 while (expect_true (cxix >= 0)) 783 while (expect_true (cxix >= 0))
613 { 784 {
614 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
615 786
616 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))
617 { 788 {
618 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
619 790
620 if (expect_true (CvDEPTH (cv))) 791 if (expect_true (CvDEPTH (cv)))
621 { 792 {
… …
640 811
641 PUTBACK; 812 PUTBACK;
642 } 813 }
643 814
644 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
645 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
646 if (SLOT_COUNT >= 1) CXINC;
647 if (SLOT_COUNT >= 2) CXINC;
648 if (SLOT_COUNT >= 3) CXINC;
649 { 817 {
650 int i; 818 unsigned int i;
819
651 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
652 CXINC; 821 CXINC;
653 } 822
654 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
655 825
656 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
657 827
658 { 828 {
659 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
… …
680# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
681#else 851#else
682static void 852static void
683coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
684{ 854{
685 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() */
686 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
687 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
688 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
689 859
690 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
889slf_check_repeat (pTHX_ struct CoroSLF *frame) 1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
890{ 1060{
891 return 1; 1061 return 1;
892} 1062}
893 1063
894static UNOP coro_setup_op; 1064static UNOP init_perl_op;
895 1065
896static 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 */
897coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
898{ 1068{
899 /* 1069 /*
900 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
901 */ 1071 */
902 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
… …
909 PL_comppad_name_fill = 0; 1079 PL_comppad_name_fill = 0;
910 PL_comppad_name_floor = 0; 1080 PL_comppad_name_floor = 0;
911 PL_curpm = 0; 1081 PL_curpm = 0;
912 PL_curpad = 0; 1082 PL_curpad = 0;
913 PL_localizing = 0; 1083 PL_localizing = 0;
914 PL_dirty = 0;
915 PL_restartop = 0; 1084 PL_restartop = 0;
916#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
917 PL_parser = 0; 1086 PL_parser = 0;
918#endif 1087#endif
919 PL_hints = 0; 1088 PL_hints = 0;
… …
949 /* 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
950 * 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.
951 */ 1120 */
952 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 */
953 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;
954 1124
955 /* 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 */
956 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
957 coro_setup_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
958 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
959 /* 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 */
960 1130
961 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
962 1132
963 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
964 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 }
965} 1143}
966 1144
967static void 1145static void
968coro_unwind_stacks (pTHX) 1146coro_unwind_stacks (pTHX)
969{ 1147{
… …
984 dounwind (-1); 1162 dounwind (-1);
985 } 1163 }
986} 1164}
987 1165
988static void 1166static void
989coro_destruct_perl (pTHX_ struct coro *coro) 1167destroy_perl (pTHX_ struct coro *coro)
990{ 1168{
1169 SV *svf [9];
1170
1171 {
1172 SV *old_current = SvRV (coro_current);
1173 struct coro *current = SvSTATE (old_current);
1174
1175 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1176
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
1182 load_perl (aTHX_ coro);
1183
991 coro_unwind_stacks (aTHX); 1184 coro_unwind_stacks (aTHX);
992 1185
993 SvREFCNT_dec (GvSV (PL_defgv)); 1186 /* restore swapped sv's */
994 SvREFCNT_dec (GvAV (PL_defgv)); 1187 SWAP_SVS (coro);
995 SvREFCNT_dec (GvSV (PL_errgv));
996 SvREFCNT_dec (PL_defoutgv);
997 SvREFCNT_dec (PL_rs);
998 SvREFCNT_dec (GvSV (irsgv));
999 SvREFCNT_dec (GvHV (PL_hintgv));
1000 1188
1001 SvREFCNT_dec (PL_diehook); 1189 coro_destruct_stacks (aTHX);
1002 SvREFCNT_dec (PL_warnhook); 1190
1191 // now save some sv's to be free'd later
1192 svf [0] = GvSV (PL_defgv);
1193 svf [1] = (SV *)GvAV (PL_defgv);
1194 svf [2] = GvSV (PL_errgv);
1195 svf [3] = (SV *)PL_defoutgv;
1196 svf [4] = PL_rs;
1197 svf [5] = GvSV (irsgv);
1198 svf [6] = (SV *)GvHV (PL_hintgv);
1199 svf [7] = PL_diehook;
1200 svf [8] = PL_warnhook;
1201 assert (9 == sizeof (svf) / sizeof (*svf));
1202
1203 SvRV_set (coro_current, old_current);
1204
1205 load_perl (aTHX_ current);
1003 1206 }
1207
1208 {
1209 unsigned int i;
1210
1211 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1212 SvREFCNT_dec (svf [i]);
1213
1004 SvREFCNT_dec (coro->saved_deffh); 1214 SvREFCNT_dec (coro->saved_deffh);
1005 SvREFCNT_dec (coro->rouse_cb); 1215 SvREFCNT_dec (coro->rouse_cb);
1006 SvREFCNT_dec (coro->invoke_cb); 1216 SvREFCNT_dec (coro->invoke_cb);
1007 SvREFCNT_dec (coro->invoke_av); 1217 SvREFCNT_dec (coro->invoke_av);
1008 1218 }
1009 coro_destruct_stacks (aTHX);
1010} 1219}
1011 1220
1012INLINE void 1221INLINE void
1013free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
1014{ 1223{
1015 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
1016 { 1225 {
1017 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
1018 coro_mortal = 0; 1227 coro_mortal = 0;
1019 } 1228 }
1020} 1229}
1021 1230
1022static int 1231static int
… …
1211 /* 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 */
1212 PL_restartop = PL_op; 1421 PL_restartop = PL_op;
1213 perl_run (PL_curinterp); 1422 perl_run (PL_curinterp);
1214 /* 1423 /*
1215 * 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
1216 * 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.
1217 */ 1427 */
1218 1428
1219 /* 1429 /*
1220 * 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
1221 * 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)
… …
1308cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1309{ 1519{
1310 if (!cctx) 1520 if (!cctx)
1311 return; 1521 return;
1312 1522
1313 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1314 1524
1315 --cctx_count; 1525 --cctx_count;
1316 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1317 1527
1318 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
… …
1382 /* TODO: throwing up here is considered harmful */ 1592 /* TODO: throwing up here is considered harmful */
1383 1593
1384 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1385 { 1595 {
1386 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1387 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1597 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1388 1598
1389 if (expect_false (next->flags & CF_RUNNING))
1390 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1391
1392 if (expect_false (next->flags & CF_DESTROYED)) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1393 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1600 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1394 1601
1395#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1396 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1397 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1604 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1398#endif 1605#endif
… …
1431 if (expect_false (next->flags & CF_NEW)) 1638 if (expect_false (next->flags & CF_NEW))
1432 { 1639 {
1433 /* need to start coroutine */ 1640 /* need to start coroutine */
1434 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1435 /* setup coroutine call */ 1642 /* setup coroutine call */
1436 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1437 } 1644 }
1438 else 1645 else
1439 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1440 1647
1441 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
… …
1480#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))
1481#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1482 1689
1483/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1484 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 */
1485static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1486coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1487{ 1699{
1488 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_DESTROYED)
1489 return 0; 1701 return;
1490 1702
1491 if (coro->on_destroy)
1492 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1493 1704
1494 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_DESTROYED;
1495 1706
1496 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1497 { 1708 {
… …
1499 /* alternative: look through all ready queues and remove the coro */ 1710 /* alternative: look through all ready queues and remove the coro */
1500 --coro_nready; 1711 --coro_nready;
1501 } 1712 }
1502 else 1713 else
1503 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;
1504 1719
1505 if (coro->mainstack 1720 if (coro->mainstack
1506 && coro->mainstack != main_mainstack 1721 && coro->mainstack != main_mainstack
1507 && coro->slot 1722 && coro->slot
1508 && !PL_dirty) 1723 && !PL_dirty)
1509 {
1510 struct coro *current = SvSTATE_current;
1511
1512 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1513
1514 save_perl (aTHX_ current);
1515 load_perl (aTHX_ coro);
1516
1517 coro_destruct_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1518
1519 load_perl (aTHX_ current);
1520
1521 coro->slot = 0;
1522 }
1523 1725
1524 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1525 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1526 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1527 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1528 1731
1529 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (coro);
1530 if (coro->prev) coro->prev->next = coro->next;
1531 if (coro == coro_first) coro_first = coro->next;
1532 1733
1533 return 1; 1734 /* more destruction mayhem in coro_state_free */
1534} 1735}
1535 1736
1536static int 1737static int
1537coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1538{ 1739{
1539 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1540 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1541 1742
1542 coro->hv = 0;
1543
1544 if (--coro->refcnt < 0)
1545 {
1546 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1547 Safefree (coro); 1747 Safefree (coro);
1548 }
1549 1748
1550 return 0; 1749 return 0;
1551} 1750}
1552 1751
1553static int 1752static int
1554coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1555{ 1754{
1556 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1557 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1558 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1559 1759
1560 return 0; 1760 return 0;
1561} 1761}
1562 1762
1563static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1586 1786
1587 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1787 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1588 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1589} 1789}
1590 1790
1591/*****************************************************************************/
1592/* gensub: simple closure generation utility */
1593
1594#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1595
1596/* create a closure from XS, returns a code reference */
1597/* the arg can be accessed via GENSUB_ARG from the callback */
1598/* the callback must use dXSARGS/XSRETURN */
1599static SV *
1600gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1601{
1602 CV *cv = (CV *)newSV (0);
1603
1604 sv_upgrade ((SV *)cv, SVt_PVCV);
1605
1606 CvANON_on (cv);
1607 CvISXSUB_on (cv);
1608 CvXSUB (cv) = xsub;
1609 GENSUB_ARG = arg;
1610
1611 return newRV_noinc ((SV *)cv);
1612}
1613
1614/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1615 1792
1616INLINE void 1793INLINE void
1617coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1618{ 1795{
1619 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1620}
1621 1797
1622INLINE SV * 1798 SvREFCNT_inc_NN (coro->hv);
1799
1800 coro->next_ready = 0;
1801 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1802 ready [1] = coro;
1803}
1804
1805INLINE struct coro *
1623coro_deq (pTHX) 1806coro_deq (pTHX)
1624{ 1807{
1625 int prio; 1808 int prio;
1626 1809
1627 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1628 if (AvFILLp (coro_ready [prio]) >= 0) 1811 {
1629 return av_shift (coro_ready [prio]); 1812 struct coro **ready = coro_ready [prio];
1813
1814 if (ready [0])
1815 {
1816 struct coro *coro = ready [0];
1817 ready [0] = coro->next_ready;
1818 return coro;
1819 }
1820 }
1630 1821
1631 return 0; 1822 return 0;
1823}
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;
1632} 1840}
1633 1841
1634static int 1842static int
1635api_ready (pTHX_ SV *coro_sv) 1843api_ready (pTHX_ SV *coro_sv)
1636{ 1844{
1637 struct coro *coro;
1638 SV *sv_hook;
1639 void (*xs_hook)(void);
1640
1641 coro = SvSTATE (coro_sv); 1845 struct coro *coro = SvSTATE (coro_sv);
1642 1846
1643 if (coro->flags & CF_READY) 1847 if (coro->flags & CF_READY)
1644 return 0; 1848 return 0;
1645 1849
1646 coro->flags |= CF_READY; 1850 coro->flags |= CF_READY;
1647 1851
1648 sv_hook = coro_nready ? 0 : coro_readyhook;
1649 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1650
1651 coro_enq (aTHX_ coro); 1852 coro_enq (aTHX_ coro);
1652 ++coro_nready;
1653 1853
1654 if (sv_hook) 1854 if (!coro_nready++)
1655 { 1855 if (coroapi.readyhook)
1656 dSP; 1856 coroapi.readyhook ();
1657
1658 ENTER;
1659 SAVETMPS;
1660
1661 PUSHMARK (SP);
1662 PUTBACK;
1663 call_sv (sv_hook, G_VOID | G_DISCARD);
1664
1665 FREETMPS;
1666 LEAVE;
1667 }
1668
1669 if (xs_hook)
1670 xs_hook ();
1671 1857
1672 return 1; 1858 return 1;
1673} 1859}
1674 1860
1675static int 1861static int
… …
1698static void 1884static void
1699prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1885prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1700{ 1886{
1701 for (;;) 1887 for (;;)
1702 { 1888 {
1703 SV *next_sv = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1704 1890
1705 if (expect_true (next_sv)) 1891 if (expect_true (next))
1706 { 1892 {
1707 struct coro *next = SvSTATE_hv (next_sv);
1708
1709 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1710 if (expect_false (next->flags & CF_DESTROYED)) 1894 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1711 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1895 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1712 else 1896 else
1713 { 1897 {
1714 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1715 --coro_nready; 1899 --coro_nready;
1716 1900
… …
1722 { 1906 {
1723 /* nothing to schedule: call the idle handler */ 1907 /* nothing to schedule: call the idle handler */
1724 if (SvROK (sv_idle) 1908 if (SvROK (sv_idle)
1725 && SvOBJECT (SvRV (sv_idle))) 1909 && SvOBJECT (SvRV (sv_idle)))
1726 { 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
1727 ++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 */
1728 api_ready (aTHX_ SvRV (sv_idle)); 1915 api_ready (aTHX_ SvRV (sv_idle));
1729 --coro_nready; 1916 --coro_nready;
1730 } 1917 }
1731 else 1918 else
1732 { 1919 {
1920 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1733 dSP; 1921 dSP;
1734 1922
1735 ENTER; 1923 ENTER;
1736 SAVETMPS; 1924 SAVETMPS;
1737 1925
… …
1844 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1845 } 2033 }
1846} 2034}
1847 2035
1848static 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
1849coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1850{ 2114{
1851 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1852 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1853 2116
1854 if (on_destroyp) 2117 if (!od)
1855 { 2118 return;
1856 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1857 2119
1858 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
1859 { 2128 {
1860 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1861 SV *cb = av_pop (on_destroy);
1862
1863 PUSHMARK (SP); 2130 PUSHMARK (SP);
1864 2131
1865 if (statusp) 2132 if (coro->status)
1866 { 2133 {
1867 int i; 2134 PUTBACK;
1868 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1869 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1870
1871 for (i = 0; i <= AvFILLp (status); ++i)
1872 PUSHs (AvARRAY (status)[i]);
1873 } 2137 }
1874 2138
1875 PUTBACK; 2139 PUTBACK;
1876 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1877 } 2141 }
1878 } 2142 }
1879} 2143}
1880 2144
1881static void 2145static void
1882slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1883{ 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 {
1884 int i; 2161 int i;
1885 HV *hv = (HV *)SvRV (coro_current);
1886 AV *av = newAV ();
1887 2162
1888 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
2164
1889 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
1890 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2167 }
2168}
1891 2169
1892 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
1893 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
1894 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 */
1895 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
1896 2175
1897 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1898 frame->check = slf_check_repeat; 2177 frame->check = slf_check_repeat;
1899 2178
1900 /* as a minor optimisation, we could unwind all stacks here */ 2179 /* as a minor optimisation, we could unwind all stacks here */
1901 /* 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 */
1902 /*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;
1903} 2285}
1904 2286
1905/*****************************************************************************/ 2287/*****************************************************************************/
1906/* async pool handler */ 2288/* async pool handler */
1907 2289
… …
1947 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1948 2330
1949 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1950 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1951 { 2333 {
1952 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1953 coro->invoke_av = newAV (); 2335 return;
1954
1955 frame->prepare = prepare_nop;
1956 } 2336 }
1957 else 2337 else
1958 { 2338 {
1959 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1960 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);
… …
1985 2365
1986static void 2366static void
1987coro_rouse_callback (pTHX_ CV *cv) 2367coro_rouse_callback (pTHX_ CV *cv)
1988{ 2368{
1989 dXSARGS; 2369 dXSARGS;
1990 SV *data = (SV *)GENSUB_ARG; 2370 SV *data = (SV *)S_GENSUB_ARG;
1991 2371
1992 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2372 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1993 { 2373 {
1994 /* first call, set args */ 2374 /* first call, set args */
2375 SV *coro = SvRV (data);
1995 AV *av = newAV (); 2376 AV *av = newAV ();
1996 SV *coro = SvRV (data);
1997 2377
1998 SvRV_set (data, (SV *)av); 2378 SvRV_set (data, (SV *)av);
1999 api_ready (aTHX_ coro);
2000 SvREFCNT_dec (coro);
2001 2379
2002 /* better take a full copy of the arguments */ 2380 /* better take a full copy of the arguments */
2003 while (items--) 2381 while (items--)
2004 av_store (av, items, newSVsv (ST (items))); 2382 av_store (av, items, newSVsv (ST (items)));
2383
2384 api_ready (aTHX_ coro);
2385 SvREFCNT_dec (coro);
2005 } 2386 }
2006 2387
2007 XSRETURN_EMPTY; 2388 XSRETURN_EMPTY;
2008} 2389}
2009 2390
… …
2026 2407
2027 EXTEND (SP, AvFILLp (av) + 1); 2408 EXTEND (SP, AvFILLp (av) + 1);
2028 for (i = 0; i <= AvFILLp (av); ++i) 2409 for (i = 0; i <= AvFILLp (av); ++i)
2029 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2410 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2030 2411
2031 /* we have stolen the elements, so ste length to zero and free */ 2412 /* we have stolen the elements, so set length to zero and free */
2032 AvFILLp (av) = -1; 2413 AvFILLp (av) = -1;
2033 av_undef (av); 2414 av_undef (av);
2034 2415
2035 PUTBACK; 2416 PUTBACK;
2036 } 2417 }
… …
2060 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
2061 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2062 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
2063 2444
2064 { 2445 {
2065 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2066 SV *data = (SV *)GENSUB_ARG; 2447 SV *data = (SV *)S_GENSUB_ARG;
2067 2448
2068 frame->data = (void *)data; 2449 frame->data = (void *)data;
2069 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2070 frame->check = slf_check_rouse_wait; 2451 frame->check = slf_check_rouse_wait;
2071 } 2452 }
… …
2075coro_new_rouse_cb (pTHX) 2456coro_new_rouse_cb (pTHX)
2076{ 2457{
2077 HV *hv = (HV *)SvRV (coro_current); 2458 HV *hv = (HV *)SvRV (coro_current);
2078 struct coro *coro = SvSTATE_hv (hv); 2459 struct coro *coro = SvSTATE_hv (hv);
2079 SV *data = newRV_inc ((SV *)hv); 2460 SV *data = newRV_inc ((SV *)hv);
2080 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2081 2462
2082 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);
2083 SvREFCNT_dec (data); /* magicext increases the refcount */ 2464 SvREFCNT_dec (data); /* magicext increases the refcount */
2084 2465
2085 SvREFCNT_dec (coro->rouse_cb); 2466 SvREFCNT_dec (coro->rouse_cb);
… …
2182static void 2563static void
2183slf_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)
2184{ 2565{
2185 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2186 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;
2187} 2585}
2188 2586
2189/* 2587/*
2190 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2191 * 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
… …
2260 croak (0); 2658 croak (0);
2261 } 2659 }
2262 2660
2263 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2264 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2265 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2266 { 2665 {
2267 dSP; 2666 dSP;
2268 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2269 2668
2270 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2271 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2272 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2273 bot [1] = *sp; 2672 bot [1] = *sp;
2274 2673
2275 SP = bot + 1; 2674 SP = bot + 1;
2276 2675
2277 PUTBACK; 2676 PUTBACK;
… …
2310 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2311 { 2710 {
2312 if (items > slf_arga) 2711 if (items > slf_arga)
2313 { 2712 {
2314 slf_arga = items; 2713 slf_arga = items;
2315 free (slf_argv); 2714 Safefree (slf_argv);
2316 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2317 } 2716 }
2318 2717
2319 slf_argc = items; 2718 slf_argc = items;
2320 2719
2321 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
… …
2456/* Coro::Semaphore & Coro::Signal */ 2855/* Coro::Semaphore & Coro::Signal */
2457 2856
2458static SV * 2857static SV *
2459coro_waitarray_new (pTHX_ int count) 2858coro_waitarray_new (pTHX_ int count)
2460{ 2859{
2461 /* 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 */
2462 AV *av = newAV (); 2861 AV *av = newAV ();
2463 SV **ary; 2862 SV **ary;
2464 2863
2465 /* unfortunately, building manually saves memory */ 2864 /* unfortunately, building manually saves memory */
2466 Newx (ary, 2, SV *); 2865 Newx (ary, 2, SV *);
… …
2517 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2518 } 2917 }
2519} 2918}
2520 2919
2521static void 2920static void
2522coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2523{ 2922{
2524 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2525 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2526} 2925}
2527 2926
2528static int 2927static int
2529slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2530{ 2929{
2531 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2532 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2533 2933
2534 /* 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 */
2535 if (CORO_THROW) 2935 if (CORO_THROW)
2536 return 0; 2936 return 0;
2537 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2538 { 2938 {
2539 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2540 2940
2541 if (acquire) 2941 if (acquire)
2542 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2543 else 2943 else
2544 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2549 { 2949 {
2550 int i; 2950 int i;
2551 /* 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 */
2552 /* 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 */
2553 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2554 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2555 for (i = 1; i <= AvFILLp (av); ++i)
2556 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2557 return 1; 2956 return 1;
2558 2957
2559 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2560 return 1; 2959 return 1;
2561 } 2960 }
2562} 2961}
2563 2962
2564static int 2963static int
… …
2587 { 2986 {
2588 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2589 2988
2590 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2591 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2592
2593 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2594 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2595 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2596 } 2994 }
2597} 2995}
2598 2996
2599static void 2997static void
2600slf_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)
… …
2608{ 3006{
2609 if (items >= 2) 3007 if (items >= 2)
2610 { 3008 {
2611 /* callback form */ 3009 /* callback form */
2612 AV *av = (AV *)SvRV (arg [0]); 3010 AV *av = (AV *)SvRV (arg [0]);
2613 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3011 SV *cb_cv = s_get_cv_croak (arg [1]);
2614 3012
2615 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3013 av_push (av, SvREFCNT_inc_NN (cb_cv));
2616 3014
2617 if (SvIVX (AvARRAY (av)[0]) > 0) 3015 if (SvIVX (AvARRAY (av)[0]) > 0)
2618 coro_semaphore_adjust (aTHX_ av, 0); 3016 coro_semaphore_adjust (aTHX_ av, 0);
2619 3017
2620 frame->prepare = prepare_nop; 3018 frame->prepare = prepare_nop;
… …
2644 AvARRAY (av)[0] = AvARRAY (av)[1]; 3042 AvARRAY (av)[0] = AvARRAY (av)[1];
2645 AvARRAY (av)[1] = cb; 3043 AvARRAY (av)[1] = cb;
2646 3044
2647 cb = av_shift (av); 3045 cb = av_shift (av);
2648 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 {
2649 api_ready (aTHX_ cb); 3057 api_ready (aTHX_ cb);
2650 sv_setiv (cb, 0); /* signal waiter */ 3058 sv_setiv (cb, 0); /* signal waiter */
3059 }
3060
2651 SvREFCNT_dec (cb); 3061 SvREFCNT_dec (cb);
2652 3062
2653 --count; 3063 --count;
2654 } 3064 }
2655} 3065}
… …
2664static void 3074static void
2665slf_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)
2666{ 3076{
2667 AV *av = (AV *)SvRV (arg [0]); 3077 AV *av = (AV *)SvRV (arg [0]);
2668 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
2669 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]))
2670 { 3091 {
2671 SvIVX (AvARRAY (av)[0]) = 0; 3092 SvIVX (AvARRAY (av)[0]) = 0;
2672 frame->prepare = prepare_nop; 3093 frame->prepare = prepare_nop;
2673 frame->check = slf_check_nop; 3094 frame->check = slf_check_nop;
2674 } 3095 }
2675 else 3096 else
2676 { 3097 {
2677 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3098 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2678 3099
2679 av_push (av, waiter); 3100 av_push (av, waiter);
2680 3101
2681 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 */
2682 frame->prepare = prepare_schedule; 3103 frame->prepare = prepare_schedule;
… …
2700 3121
2701static void 3122static void
2702coro_aio_callback (pTHX_ CV *cv) 3123coro_aio_callback (pTHX_ CV *cv)
2703{ 3124{
2704 dXSARGS; 3125 dXSARGS;
2705 AV *state = (AV *)GENSUB_ARG; 3126 AV *state = (AV *)S_GENSUB_ARG;
2706 SV *coro = av_pop (state); 3127 SV *coro = av_pop (state);
2707 SV *data_sv = newSV (sizeof (struct io_state)); 3128 SV *data_sv = newSV (sizeof (struct io_state));
2708 3129
2709 av_extend (state, items - 1); 3130 av_extend (state, items - 1);
2710 3131
… …
2824 3245
2825 for (i = 0; i < items; ++i) 3246 for (i = 0; i < items; ++i)
2826 PUSHs (arg [i]); 3247 PUSHs (arg [i]);
2827 3248
2828 /* now push the callback closure */ 3249 /* now push the callback closure */
2829 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))));
2830 3251
2831 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2832 PUTBACK; 3253 PUTBACK;
2833 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2834 } 3255 }
2835 3256
2836 /* 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 */
2837 frame->data = (void *)state; 3258 frame->data = (void *)state;
2838 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2839 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2840} 3261}
2841 3262
… …
2852/*****************************************************************************/ 3273/*****************************************************************************/
2853 3274
2854#if CORO_CLONE 3275#if CORO_CLONE
2855# include "clone.c" 3276# include "clone.c"
2856#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}
2857 3336
2858MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3337MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2859 3338
2860PROTOTYPES: DISABLE 3339PROTOTYPES: DISABLE
2861 3340
… …
2914 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
2915 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
2916 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
2917 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
2918 3397
2919 { 3398 time_init (aTHX);
2920 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2921 3399
2922 if (!svp) croak ("Time::HiRes is required");
2923 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2924
2925 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2926 }
2927
2928 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2929} 3401}
2930 3402
2931SV * 3403SV *
2932new (char *klass, ...) 3404new (SV *klass, ...)
2933 ALIAS: 3405 ALIAS:
2934 Coro::new = 1 3406 Coro::new = 1
2935 CODE: 3407 CODE:
2936{ 3408 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2937 struct coro *coro; 3409 OUTPUT:
2938 MAGIC *mg;
2939 HV *hv;
2940 CV *cb;
2941 int i;
2942
2943 if (items > 1)
2944 {
2945 cb = coro_sv_2cv (aTHX_ ST (1));
2946
2947 if (!ix)
2948 {
2949 if (CvISXSUB (cb))
2950 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2951
2952 if (!CvROOT (cb))
2953 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2954 }
2955 }
2956
2957 Newz (0, coro, 1, struct coro);
2958 coro->args = newAV ();
2959 coro->flags = CF_NEW;
2960
2961 if (coro_first) coro_first->prev = coro;
2962 coro->next = coro_first;
2963 coro_first = coro;
2964
2965 coro->hv = hv = newHV ();
2966 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2967 mg->mg_flags |= MGf_DUP;
2968 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2969
2970 if (items > 1)
2971 {
2972 av_extend (coro->args, items - 1 + ix - 1);
2973
2974 if (ix)
2975 {
2976 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2977 cb = cv_coro_run;
2978 }
2979
2980 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2981
2982 for (i = 2; i < items; i++)
2983 av_push (coro->args, newSVsv (ST (i)));
2984 }
2985}
2986 OUTPUT:
2987 RETVAL 3410 RETVAL
2988 3411
2989void 3412void
2990transfer (...) 3413transfer (...)
2991 PROTOTYPE: $$ 3414 PROTOTYPE: $$
2992 CODE: 3415 CODE:
2993 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2994
2995bool
2996_destroy (SV *coro_sv)
2997 CODE:
2998 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2999 OUTPUT:
3000 RETVAL
3001 3417
3002void 3418void
3003_exit (int code) 3419_exit (int code)
3004 PROTOTYPE: $ 3420 PROTOTYPE: $
3005 CODE: 3421 CODE:
… …
3081 CODE: 3497 CODE:
3082{ 3498{
3083 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3084 { 3500 {
3085 struct coro *current = SvSTATE_current; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
3086 3503
3087 if (current != coro) 3504 if (current != coro)
3088 { 3505 {
3089 PUTBACK; 3506 PUTBACK;
3090 save_perl (aTHX_ current); 3507 save_perl (aTHX_ current);
3091 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;
3092 SPAGAIN; 3518 SPAGAIN;
3093 } 3519 }
3094 3520
3095 PUSHSTACK; 3521 PUSHSTACK;
3096 3522
… …
3100 if (ix) 3526 if (ix)
3101 eval_sv (coderef, 0); 3527 eval_sv (coderef, 0);
3102 else 3528 else
3103 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3529 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3104 3530
3531 POPSTACK;
3105 SPAGAIN; 3532 SPAGAIN;
3106 POPSTACK;
3107 3533
3108 if (current != coro) 3534 if (current != coro)
3109 { 3535 {
3110 PUTBACK; 3536 PUTBACK;
3537 slf_frame = slf_save;
3111 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
3112 load_perl (aTHX_ current); 3539 load_perl (aTHX_ current);
3113 SPAGAIN; 3540 SPAGAIN;
3114 } 3541 }
3115 } 3542 }
… …
3121 ALIAS: 3548 ALIAS:
3122 is_ready = CF_READY 3549 is_ready = CF_READY
3123 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
3124 is_new = CF_NEW 3551 is_new = CF_NEW
3125 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_DESTROYED
3553 is_suspended = CF_SUSPENDED
3126 CODE: 3554 CODE:
3127 RETVAL = boolSV (coro->flags & ix); 3555 RETVAL = boolSV (coro->flags & ix);
3128 OUTPUT: 3556 OUTPUT:
3129 RETVAL 3557 RETVAL
3130 3558
3131void 3559void
3132throw (Coro::State self, SV *throw = &PL_sv_undef) 3560throw (Coro::State self, SV *exception = &PL_sv_undef)
3133 PROTOTYPE: $;$ 3561 PROTOTYPE: $;$
3134 CODE: 3562 CODE:
3135{ 3563{
3136 struct coro *current = SvSTATE_current; 3564 struct coro *current = SvSTATE_current;
3137 SV **throwp = self == current ? &CORO_THROW : &self->except; 3565 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3138 SvREFCNT_dec (*throwp); 3566 SvREFCNT_dec (*exceptionp);
3139 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3567 SvGETMAGIC (exception);
3568 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3140} 3569}
3141 3570
3142void 3571void
3143api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3572api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3144 PROTOTYPE: $;$ 3573 PROTOTYPE: $;$
… …
3195 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3624 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3196 3625
3197 SV *tmp = *src; *src = *dst; *dst = tmp; 3626 SV *tmp = *src; *src = *dst; *dst = tmp;
3198 } 3627 }
3199 3628
3629void
3630cancel (Coro::State self)
3631 CODE:
3632 coro_state_destroy (aTHX_ self);
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}
3689
3200 3690
3201MODULE = Coro::State PACKAGE = Coro 3691MODULE = Coro::State PACKAGE = Coro
3202 3692
3203BOOT: 3693BOOT:
3204{ 3694{
3205 int i;
3206
3207 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3695 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3208 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3696 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3209 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD); 3697 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3210 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3211 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);
3212 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3699 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3213 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3700 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3214 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3701 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3215 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3702 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3216 3703
3217 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);
3218 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3705 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3219 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);
3220 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 */
3221 3708
3222 coro_stash = gv_stashpv ("Coro", TRUE); 3709 coro_stash = gv_stashpv ("Coro", TRUE);
3223 3710
3224 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3711 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3225 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3712 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3226 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3713 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3227 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3714 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3228 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3715 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3229 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3716 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3230
3231 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3232 coro_ready[i] = newAV ();
3233 3717
3234 { 3718 {
3235 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3719 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3236 3720
3237 coroapi.schedule = api_schedule; 3721 coroapi.schedule = api_schedule;
… …
3247 sv_setiv (sv, (IV)&coroapi); 3731 sv_setiv (sv, (IV)&coroapi);
3248 SvREADONLY_on (sv); 3732 SvREADONLY_on (sv);
3249 } 3733 }
3250} 3734}
3251 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
3252void 3761void
3253terminate (...) 3762terminate (...)
3254 CODE: 3763 CODE:
3255 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3764 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3256 3765
3257void 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
3774
3775void
3258schedule (...) 3776schedule (...)
3259 CODE: 3777 CODE:
3260 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3778 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3261 3779
3262void 3780void
… …
3276 3794
3277void 3795void
3278cede_notself (...) 3796cede_notself (...)
3279 CODE: 3797 CODE:
3280 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3798 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3281
3282void
3283_cancel (Coro::State self)
3284 CODE:
3285 coro_state_destroy (aTHX_ self);
3286 coro_call_on_destroy (aTHX_ self);
3287 3799
3288void 3800void
3289_set_current (SV *current) 3801_set_current (SV *current)
3290 PROTOTYPE: $ 3802 PROTOTYPE: $
3291 CODE: 3803 CODE:
… …
3295void 3807void
3296_set_readyhook (SV *hook) 3808_set_readyhook (SV *hook)
3297 PROTOTYPE: $ 3809 PROTOTYPE: $
3298 CODE: 3810 CODE:
3299 SvREFCNT_dec (coro_readyhook); 3811 SvREFCNT_dec (coro_readyhook);
3812 SvGETMAGIC (hook);
3813 if (SvOK (hook))
3814 {
3300 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 }
3301 3823
3302int 3824int
3303prio (Coro::State coro, int newprio = 0) 3825prio (Coro::State coro, int newprio = 0)
3304 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
3305 ALIAS: 3827 ALIAS:
… …
3311 if (items > 1) 3833 if (items > 1)
3312 { 3834 {
3313 if (ix) 3835 if (ix)
3314 newprio = coro->prio - newprio; 3836 newprio = coro->prio - newprio;
3315 3837
3316 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3838 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3317 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3839 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3318 3840
3319 coro->prio = newprio; 3841 coro->prio = newprio;
3320 } 3842 }
3321} 3843}
3322 OUTPUT: 3844 OUTPUT:
… …
3337 RETVAL = coro_nready; 3859 RETVAL = coro_nready;
3338 OUTPUT: 3860 OUTPUT:
3339 RETVAL 3861 RETVAL
3340 3862
3341void 3863void
3864suspend (Coro::State self)
3865 PROTOTYPE: $
3866 CODE:
3867 self->flags |= CF_SUSPENDED;
3868
3869void
3870resume (Coro::State self)
3871 PROTOTYPE: $
3872 CODE:
3873 self->flags &= ~CF_SUSPENDED;
3874
3875void
3342_pool_handler (...) 3876_pool_handler (...)
3343 CODE: 3877 CODE:
3344 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3878 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3345 3879
3346void 3880void
… …
3357 for (i = 1; i < items; ++i) 3891 for (i = 1; i < items; ++i)
3358 av_push (av, SvREFCNT_inc_NN (ST (i))); 3892 av_push (av, SvREFCNT_inc_NN (ST (i)));
3359 3893
3360 if ((SV *)hv == &PL_sv_undef) 3894 if ((SV *)hv == &PL_sv_undef)
3361 { 3895 {
3362 PUSHMARK (SP); 3896 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3363 EXTEND (SP, 2);
3364 PUSHs (sv_Coro);
3365 PUSHs ((SV *)cv_pool_handler);
3366 PUTBACK;
3367 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3368 SPAGAIN;
3369
3370 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3897 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3898 SvREFCNT_dec (sv);
3371 } 3899 }
3372 3900
3373 { 3901 {
3374 struct coro *coro = SvSTATE_hv (hv); 3902 struct coro *coro = SvSTATE_hv (hv);
3375 3903
… …
3409 CODE: 3937 CODE:
3410{ 3938{
3411 struct coro *coro = SvSTATE_current; 3939 struct coro *coro = SvSTATE_current;
3412 AV **avp = ix ? &coro->on_leave : &coro->on_enter; 3940 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3413 3941
3414 block = (SV *)coro_sv_2cv (aTHX_ block); 3942 block = s_get_cv_croak (block);
3415 3943
3416 if (!*avp) 3944 if (!*avp)
3417 *avp = newAV (); 3945 *avp = newAV ();
3418 3946
3419 av_push (*avp, SvREFCNT_inc (block)); 3947 av_push (*avp, SvREFCNT_inc (block));
3420 3948
3421 if (!ix) 3949 if (!ix)
3422 on_enterleave_call (aTHX_ block); 3950 on_enterleave_call (aTHX_ block);
3423 3951
3424 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3952 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3425 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro); 3953 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3426 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around xs calls */ 3954 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3427} 3955}
3428 3956
3429 3957
3430MODULE = Coro::State PACKAGE = PerlIO::cede 3958MODULE = Coro::State PACKAGE = PerlIO::cede
3431 3959
… …
3436MODULE = Coro::State PACKAGE = Coro::Semaphore 3964MODULE = Coro::State PACKAGE = Coro::Semaphore
3437 3965
3438SV * 3966SV *
3439new (SV *klass, SV *count = 0) 3967new (SV *klass, SV *count = 0)
3440 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
3441 RETVAL = sv_bless ( 3980 RETVAL = sv_bless (
3442 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3981 coro_waitarray_new (aTHX_ semcnt),
3443 GvSTASH (CvGV (cv)) 3982 GvSTASH (CvGV (cv))
3444 ); 3983 );
3984}
3445 OUTPUT: 3985 OUTPUT:
3446 RETVAL 3986 RETVAL
3447 3987
3448# helper for Coro::Channel 3988# helper for Coro::Channel and others
3449SV * 3989SV *
3450_alloc (int count) 3990_alloc (int count)
3451 CODE: 3991 CODE:
3452 RETVAL = coro_waitarray_new (aTHX_ count); 3992 RETVAL = coro_waitarray_new (aTHX_ count);
3453 OUTPUT: 3993 OUTPUT:
… …
3511 for (i = 1; i <= wcount; ++i) 4051 for (i = 1; i <= wcount; ++i)
3512 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4052 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3513 } 4053 }
3514} 4054}
3515 4055
4056MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
4057
4058void
4059_may_delete (SV *sem, int count, int extra_refs)
4060 PPCODE:
4061{
4062 AV *av = (AV *)SvRV (sem);
4063
4064 if (SvREFCNT ((SV *)av) == 1 + extra_refs
4065 && AvFILLp (av) == 0 /* no waiters, just count */
4066 && SvIV (AvARRAY (av)[0]) == count)
4067 XSRETURN_YES;
4068
4069 XSRETURN_NO;
4070}
4071
3516MODULE = Coro::State PACKAGE = Coro::Signal 4072MODULE = Coro::State PACKAGE = Coro::Signal
3517 4073
3518SV * 4074SV *
3519new (SV *klass) 4075new (SV *klass)
3520 CODE: 4076 CODE:
… …
3591 4147
3592void 4148void
3593_register (char *target, char *proto, SV *req) 4149_register (char *target, char *proto, SV *req)
3594 CODE: 4150 CODE:
3595{ 4151{
3596 CV *req_cv = coro_sv_2cv (aTHX_ req); 4152 SV *req_cv = s_get_cv_croak (req);
3597 /* newXSproto doesn't return the CV on 5.8 */ 4153 /* newXSproto doesn't return the CV on 5.8 */
3598 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4154 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3599 sv_setpv ((SV *)slf_cv, proto); 4155 sv_setpv ((SV *)slf_cv, proto);
3600 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);
3601} 4157}
3602 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