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.293 by root, Tue Nov 18 06:10:03 2008 UTC vs.
Revision 1.369 by root, Thu Aug 13 02:48:32 2009 UTC

… …
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h" 9#include "perliol.h"
10 10
11#include "patchlevel.h" 11#include "schmorp.h"
12 12
13#include <stdio.h> 13#include <stdio.h>
14#include <errno.h> 14#include <errno.h>
15#include <assert.h> 15#include <assert.h>
16 16
17#ifdef WIN32 17#ifdef WIN32
18# undef setjmp 18# undef setjmp
19# undef longjmp 19# undef longjmp
20# undef _exit 20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask 21# define setjmp _setjmp /* deep magic */
22#else 22#else
23# include <inttypes.h> /* most portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif 24#endif
25 25
26#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
… …
51#endif 51#endif
52 52
53/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 54static int cctx_max_idle = 4;
55 55
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
111#endif 58#endif
112 59
113#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
120#endif 67#endif
121 68
122/* The next macros try to return the current stack pointer, in an as 69/* The next macros try to return the current stack pointer, in an as
123 * portable way as possible. */ 70 * portable way as possible. */
124#if __GNUC__ >= 4 71#if __GNUC__ >= 4
72# define dSTACKLEVEL int stacklevel_dummy
125# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0) 73# define STACKLEVEL __builtin_frame_address (0)
126#else 74#else
127# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
76# define STACKLEVEL ((void *)&stacklevel)
128#endif 77#endif
129 78
130#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
131 80
132#if __GNUC__ >= 3 81#if __GNUC__ >= 3
133# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
134# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
135# define INLINE static inline 84# define INLINE static inline
136#else 85#else
137# define attribute(x) 86# define attribute(x)
138# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
139# define INLINE static 88# define INLINE static
… …
143#define expect_true(expr) expect ((expr) != 0, 1) 92#define expect_true(expr) expect ((expr) != 0, 1)
144 93
145#define NOINLINE attribute ((noinline)) 94#define NOINLINE attribute ((noinline))
146 95
147#include "CoroAPI.h" 96#include "CoroAPI.h"
97#define GCoroAPI (&coroapi) /* very sneaky */
148 98
149#ifdef USE_ITHREADS 99#ifdef USE_ITHREADS
150# if CORO_PTHREAD 100# if CORO_PTHREAD
151static void *coro_thx; 101static void *coro_thx;
152# endif 102# endif
153#endif 103#endif
154 104
105#ifdef __linux
106# include <time.h> /* for timespec */
107# include <syscall.h> /* for SYS_* */
108# ifdef SYS_clock_gettime
109# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
110# define CORO_CLOCK_MONOTONIC 1
111# define CORO_CLOCK_THREAD_CPUTIME_ID 3
112# endif
113#endif
114
155static double (*nvtime)(); /* so why doesn't it take void? */ 115static double (*nvtime)(); /* so why doesn't it take void? */
116static void (*u2time)(pTHX_ UV ret[2]);
156 117
157/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
158#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
159static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
160 121
… …
164static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
165static JMPENV *main_top_env; 126static JMPENV *main_top_env;
166static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
167static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
168 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
169static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
170static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
171static SV *rv_diehook; 136static SV *rv_diehook;
172static SV *rv_warnhook; 137static SV *rv_warnhook;
173static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
174 139
175/* async_pool helper stuff */ 140/* async_pool helper stuff */
176static SV *sv_pool_rss; 141static SV *sv_pool_rss;
177static SV *sv_pool_size; 142static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */
178static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler;
179 147
180/* Coro::AnyEvent */ 148/* Coro::AnyEvent */
181static SV *sv_activity; 149static SV *sv_activity;
150
151/* enable processtime/realtime profiling */
152static char enable_times;
153typedef U32 coro_ts[2];
154static coro_ts time_real, time_cpu;
155static char times_valid;
182 156
183static struct coro_cctx *cctx_first; 157static struct coro_cctx *cctx_first;
184static int cctx_count, cctx_idle; 158static int cctx_count, cctx_idle;
185 159
186enum { 160enum {
… …
212 int valgrind_id; 186 int valgrind_id;
213#endif 187#endif
214 unsigned char flags; 188 unsigned char flags;
215} coro_cctx; 189} coro_cctx;
216 190
191coro_cctx *cctx_current; /* the currently running cctx */
192
193/*****************************************************************************/
194
217enum { 195enum {
218 CF_RUNNING = 0x0001, /* coroutine is running */ 196 CF_RUNNING = 0x0001, /* coroutine is running */
219 CF_READY = 0x0002, /* coroutine is ready */ 197 CF_READY = 0x0002, /* coroutine is ready */
220 CF_NEW = 0x0004, /* has never been switched to */ 198 CF_NEW = 0x0004, /* has never been switched to */
221 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
222}; 201};
223 202
224/* the structure where most of the perl state is stored, overlaid on the cxstack */ 203/* the structure where most of the perl state is stored, overlaid on the cxstack */
225typedef struct 204typedef struct
226{ 205{
227 SV *defsv; 206 SV *defsv;
228 AV *defav; 207 AV *defav;
229 SV *errsv; 208 SV *errsv;
230 SV *irsgv; 209 SV *irsgv;
210 HV *hinthv;
231#define VAR(name,type) type name; 211#define VAR(name,type) type name;
232# include "state.h" 212# include "state.h"
233#undef VAR 213#undef VAR
234} perl_slots; 214} perl_slots;
235 215
… …
238/* this is a structure representing a perl-level coroutine */ 218/* this is a structure representing a perl-level coroutine */
239struct coro { 219struct coro {
240 /* the C coroutine allocated to this perl coroutine, if any */ 220 /* the C coroutine allocated to this perl coroutine, if any */
241 coro_cctx *cctx; 221 coro_cctx *cctx;
242 222
223 /* ready queue */
224 struct coro *next_ready;
225
243 /* state data */ 226 /* state data */
244 struct CoroSLF slf_frame; /* saved slf frame */ 227 struct CoroSLF slf_frame; /* saved slf frame */
245 AV *mainstack; 228 AV *mainstack;
246 perl_slots *slot; /* basically the saved sp */ 229 perl_slots *slot; /* basically the saved sp */
247 230
231 CV *startcv; /* the CV to execute */
248 AV *args; /* data associated with this coroutine (initial args) */ 232 AV *args; /* data associated with this coroutine (initial args) */
249 int refcnt; /* coroutines are refcounted, yes */ 233 int refcnt; /* coroutines are refcounted, yes */
250 int flags; /* CF_ flags */ 234 int flags; /* CF_ flags */
251 HV *hv; /* the perl hash associated with this coro, if any */ 235 HV *hv; /* the perl hash associated with this coro, if any */
252 void (*on_destroy)(pTHX_ struct coro *coro); 236 void (*on_destroy)(pTHX_ struct coro *coro);
253 237
254 /* statistics */ 238 /* statistics */
255 int usecount; /* number of transfers to this coro */ 239 int usecount; /* number of transfers to this coro */
256 240
257 /* coro process data */ 241 /* coro process data */
258 int prio; 242 int prio;
259 SV *throw; /* exception to be thrown */ 243 SV *except; /* exception to be thrown */
244 SV *rouse_cb;
260 245
261 /* async_pool */ 246 /* async_pool */
262 SV *saved_deffh; 247 SV *saved_deffh;
248 SV *invoke_cb;
249 AV *invoke_av;
250
251 /* on_enter/on_leave */
252 AV *on_enter;
253 AV *on_leave;
254
255 /* times */
256 coro_ts t_cpu, t_real;
263 257
264 /* linked list */ 258 /* linked list */
265 struct coro *next, *prev; 259 struct coro *next, *prev;
266}; 260};
267 261
… …
270 264
271/* the following variables are effectively part of the perl context */ 265/* the following variables are effectively part of the perl context */
272/* and get copied between struct coro and these variables */ 266/* and get copied between struct coro and these variables */
273/* the mainr easonw e don't support windows process emulation */ 267/* the mainr easonw e don't support windows process emulation */
274static struct CoroSLF slf_frame; /* the current slf frame */ 268static struct CoroSLF slf_frame; /* the current slf frame */
275static SV *coro_throw;
276 269
277/** Coro ********************************************************************/ 270/** Coro ********************************************************************/
278 271
279#define PRIO_MAX 3 272#define CORO_PRIO_MAX 3
280#define PRIO_HIGH 1 273#define CORO_PRIO_HIGH 1
281#define PRIO_NORMAL 0 274#define CORO_PRIO_NORMAL 0
282#define PRIO_LOW -1 275#define CORO_PRIO_LOW -1
283#define PRIO_IDLE -3 276#define CORO_PRIO_IDLE -3
284#define PRIO_MIN -4 277#define CORO_PRIO_MIN -4
285 278
286/* for Coro.pm */ 279/* for Coro.pm */
287static SV *coro_current; 280static SV *coro_current;
288static SV *coro_readyhook; 281static SV *coro_readyhook;
289static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 282static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
283static CV *cv_coro_run, *cv_coro_terminate;
290static struct coro *coro_first; 284static struct coro *coro_first;
291#define coro_nready coroapi.nready 285#define coro_nready coroapi.nready
286
287/** Coro::Select ************************************************************/
288
289static OP *(*coro_old_pp_sselect) (pTHX);
290static SV *coro_select_select;
291
292/* horrible hack, but if it works... */
293static OP *
294coro_pp_sselect (aTHX)
295{
296 dSP;
297 PUSHMARK (SP - 4); /* fake argument list */
298 XPUSHs (coro_select_select);
299 PUTBACK;
300
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX);
305}
292 306
293/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
294 308
295static SV * 309static SV *
296coro_get_sv (pTHX_ const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
… …
320 get_hv (name, create); 334 get_hv (name, create);
321#endif 335#endif
322 return get_hv (name, create); 336 return get_hv (name, create);
323} 337}
324 338
339INLINE void
340coro_times_update ()
341{
342#ifdef coro_clock_gettime
343 struct timespec ts;
344
345 ts.tv_sec = ts.tv_nsec = 0;
346 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
347 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
348
349 ts.tv_sec = ts.tv_nsec = 0;
350 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
351 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
352#else
353 dTHX;
354 UV tv[2];
355
356 u2time (aTHX_ tv);
357 time_real [0] = tv [0];
358 time_real [1] = tv [1] * 1000;
359#endif
360}
361
362INLINE void
363coro_times_add (struct coro *c)
364{
365 c->t_real [1] += time_real [1];
366 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
367 c->t_real [0] += time_real [0];
368
369 c->t_cpu [1] += time_cpu [1];
370 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
371 c->t_cpu [0] += time_cpu [0];
372}
373
374INLINE void
375coro_times_sub (struct coro *c)
376{
377 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
378 c->t_real [1] -= time_real [1];
379 c->t_real [0] -= time_real [0];
380
381 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
382 c->t_cpu [1] -= time_cpu [1];
383 c->t_cpu [0] -= time_cpu [0];
384}
385
386/*****************************************************************************/
387/* magic glue */
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391
392#define CORO_MAGIC_NN(sv, type) \
393 (expect_true (SvMAGIC (sv)->mg_type == type) \
394 ? SvMAGIC (sv) \
395 : mg_find (sv, type))
396
397#define CORO_MAGIC(sv, type) \
398 (expect_true (SvMAGIC (sv)) \
399 ? CORO_MAGIC_NN (sv, type) \
400 : 0)
401
402#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
403#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
404
405INLINE struct coro *
406SvSTATE_ (pTHX_ SV *coro)
407{
408 HV *stash;
409 MAGIC *mg;
410
411 if (SvROK (coro))
412 coro = SvRV (coro);
413
414 if (expect_false (SvTYPE (coro) != SVt_PVHV))
415 croak ("Coro::State object required");
416
417 stash = SvSTASH (coro);
418 if (expect_false (stash != coro_stash && stash != coro_state_stash))
419 {
420 /* very slow, but rare, check */
421 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
422 croak ("Coro::State object required");
423 }
424
425 mg = CORO_MAGIC_state (coro);
426 return (struct coro *)mg->mg_ptr;
427}
428
429#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
430
431/* faster than SvSTATE, but expects a coroutine hv */
432#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
433#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
434
435/*****************************************************************************/
436/* padlist management and caching */
437
325static AV * 438static AV *
326coro_clone_padlist (pTHX_ CV *cv) 439coro_derive_padlist (pTHX_ CV *cv)
327{ 440{
328 AV *padlist = CvPADLIST (cv); 441 AV *padlist = CvPADLIST (cv);
329 AV *newpadlist, *newpad; 442 AV *newpadlist, *newpad;
330 443
331 newpadlist = newAV (); 444 newpadlist = newAV ();
… …
336 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 449 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
337#endif 450#endif
338 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 451 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
339 --AvFILLp (padlist); 452 --AvFILLp (padlist);
340 453
341 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 454 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
342 av_store (newpadlist, 1, (SV *)newpad); 455 av_store (newpadlist, 1, (SV *)newpad);
343 456
344 return newpadlist; 457 return newpadlist;
345} 458}
346 459
347static void 460static void
348free_padlist (pTHX_ AV *padlist) 461free_padlist (pTHX_ AV *padlist)
349{ 462{
350 /* may be during global destruction */ 463 /* may be during global destruction */
351 if (SvREFCNT (padlist)) 464 if (!IN_DESTRUCT)
352 { 465 {
353 I32 i = AvFILLp (padlist); 466 I32 i = AvFILLp (padlist);
354 while (i >= 0) 467
468 while (i > 0) /* special-case index 0 */
355 { 469 {
356 SV **svp = av_fetch (padlist, i--, FALSE); 470 /* we try to be extra-careful here */
357 if (svp) 471 AV *av = (AV *)AvARRAY (padlist)[i--];
358 { 472 I32 j = AvFILLp (av);
359 SV *sv; 473
360 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 474 while (j >= 0)
475 SvREFCNT_dec (AvARRAY (av)[j--]);
476
477 AvFILLp (av) = -1;
361 SvREFCNT_dec (sv); 478 SvREFCNT_dec (av);
362
363 SvREFCNT_dec (*svp);
364 }
365 } 479 }
366 480
481 SvREFCNT_dec (AvARRAY (padlist)[0]);
482
483 AvFILLp (padlist) = -1;
367 SvREFCNT_dec ((SV*)padlist); 484 SvREFCNT_dec ((SV*)padlist);
368 } 485 }
369} 486}
370 487
371static int 488static int
372coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 489coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
373{ 490{
374 AV *padlist; 491 AV *padlist;
375 AV *av = (AV *)mg->mg_obj; 492 AV *av = (AV *)mg->mg_obj;
493
494 /* perl manages to free our internal AV and _then_ call us */
495 if (IN_DESTRUCT)
496 return 0;
376 497
377 /* casting is fun. */ 498 /* casting is fun. */
378 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 499 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
379 free_padlist (aTHX_ padlist); 500 free_padlist (aTHX_ padlist);
380 501
381 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 502 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
382 503
383 return 0; 504 return 0;
384} 505}
385
386#define CORO_MAGIC_type_cv 26
387#define CORO_MAGIC_type_state PERL_MAGIC_ext
388 506
389static MGVTBL coro_cv_vtbl = { 507static MGVTBL coro_cv_vtbl = {
390 0, 0, 0, 0, 508 0, 0, 0, 0,
391 coro_cv_free 509 coro_cv_free
392}; 510};
393
394#define CORO_MAGIC_NN(sv, type) \
395 (expect_true (SvMAGIC (sv)->mg_type == type) \
396 ? SvMAGIC (sv) \
397 : mg_find (sv, type))
398
399#define CORO_MAGIC(sv, type) \
400 (expect_true (SvMAGIC (sv)) \
401 ? CORO_MAGIC_NN (sv, type) \
402 : 0)
403
404#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
405#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
406
407INLINE struct coro *
408SvSTATE_ (pTHX_ SV *coro)
409{
410 HV *stash;
411 MAGIC *mg;
412
413 if (SvROK (coro))
414 coro = SvRV (coro);
415
416 if (expect_false (SvTYPE (coro) != SVt_PVHV))
417 croak ("Coro::State object required");
418
419 stash = SvSTASH (coro);
420 if (expect_false (stash != coro_stash && stash != coro_state_stash))
421 {
422 /* very slow, but rare, check */
423 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
424 croak ("Coro::State object required");
425 }
426
427 mg = CORO_MAGIC_state (coro);
428 return (struct coro *)mg->mg_ptr;
429}
430
431#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
432
433/* faster than SvSTATE, but expects a coroutine hv */
434#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
435#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
436 511
437/* the next two functions merely cache the padlists */ 512/* the next two functions merely cache the padlists */
438static void 513static void
439get_padlist (pTHX_ CV *cv) 514get_padlist (pTHX_ CV *cv)
440{ 515{
… …
446 else 521 else
447 { 522 {
448#if CORO_PREFER_PERL_FUNCTIONS 523#if CORO_PREFER_PERL_FUNCTIONS
449 /* this is probably cleaner? but also slower! */ 524 /* this is probably cleaner? but also slower! */
450 /* in practise, it seems to be less stable */ 525 /* in practise, it seems to be less stable */
451 CV *cp = Perl_cv_clone (cv); 526 CV *cp = Perl_cv_clone (aTHX_ cv);
452 CvPADLIST (cv) = CvPADLIST (cp); 527 CvPADLIST (cv) = CvPADLIST (cp);
453 CvPADLIST (cp) = 0; 528 CvPADLIST (cp) = 0;
454 SvREFCNT_dec (cp); 529 SvREFCNT_dec (cp);
455#else 530#else
456 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 531 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
457#endif 532#endif
458 } 533 }
459} 534}
460 535
461static void 536static void
… …
468 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 543 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
469 544
470 av = (AV *)mg->mg_obj; 545 av = (AV *)mg->mg_obj;
471 546
472 if (expect_false (AvFILLp (av) >= AvMAX (av))) 547 if (expect_false (AvFILLp (av) >= AvMAX (av)))
473 av_extend (av, AvMAX (av) + 1); 548 av_extend (av, AvFILLp (av) + 1);
474 549
475 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
476} 551}
477 552
478/** load & save, init *******************************************************/ 553/** load & save, init *******************************************************/
554
555static void
556on_enterleave_call (pTHX_ SV *cb);
479 557
480static void 558static void
481load_perl (pTHX_ Coro__State c) 559load_perl (pTHX_ Coro__State c)
482{ 560{
483 perl_slots *slot = c->slot; 561 perl_slots *slot = c->slot;
484 c->slot = 0; 562 c->slot = 0;
485 563
486 PL_mainstack = c->mainstack; 564 PL_mainstack = c->mainstack;
487 565
488 GvSV (PL_defgv) = slot->defsv; 566 GvSV (PL_defgv) = slot->defsv;
489 GvAV (PL_defgv) = slot->defav; 567 GvAV (PL_defgv) = slot->defav;
490 GvSV (PL_errgv) = slot->errsv; 568 GvSV (PL_errgv) = slot->errsv;
491 GvSV (irsgv) = slot->irsgv; 569 GvSV (irsgv) = slot->irsgv;
570 GvHV (PL_hintgv) = slot->hinthv;
492 571
493 #define VAR(name,type) PL_ ## name = slot->name; 572 #define VAR(name,type) PL_ ## name = slot->name;
494 # include "state.h" 573 # include "state.h"
495 #undef VAR 574 #undef VAR
496 575
… …
509 588
510 PUTBACK; 589 PUTBACK;
511 } 590 }
512 591
513 slf_frame = c->slf_frame; 592 slf_frame = c->slf_frame;
514 coro_throw = c->throw; 593 CORO_THROW = c->except;
594
595 if (expect_false (enable_times))
596 {
597 if (expect_false (!times_valid))
598 coro_times_update ();
599
600 coro_times_sub (c);
601 }
602
603 if (expect_false (c->on_enter))
604 {
605 int i;
606
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 }
515} 610}
516 611
517static void 612static void
518save_perl (pTHX_ Coro__State c) 613save_perl (pTHX_ Coro__State c)
519{ 614{
520 c->throw = coro_throw; 615 if (expect_false (c->on_leave))
616 {
617 int i;
618
619 for (i = AvFILLp (c->on_leave); i >= 0; --i)
620 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
621 }
622
623 times_valid = 0;
624
625 if (expect_false (enable_times))
626 {
627 coro_times_update (); times_valid = 1;
628 coro_times_add (c);
629 }
630
631 c->except = CORO_THROW;
521 c->slf_frame = slf_frame; 632 c->slf_frame = slf_frame;
522 633
523 { 634 {
524 dSP; 635 dSP;
525 I32 cxix = cxstack_ix; 636 I32 cxix = cxstack_ix;
… …
537 { 648 {
538 while (expect_true (cxix >= 0)) 649 while (expect_true (cxix >= 0))
539 { 650 {
540 PERL_CONTEXT *cx = &ccstk[cxix--]; 651 PERL_CONTEXT *cx = &ccstk[cxix--];
541 652
542 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 653 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
543 { 654 {
544 CV *cv = cx->blk_sub.cv; 655 CV *cv = cx->blk_sub.cv;
545 656
546 if (expect_true (CvDEPTH (cv))) 657 if (expect_true (CvDEPTH (cv)))
547 { 658 {
… …
571 /* we manually unroll here, as usually 2 slots is enough */ 682 /* we manually unroll here, as usually 2 slots is enough */
572 if (SLOT_COUNT >= 1) CXINC; 683 if (SLOT_COUNT >= 1) CXINC;
573 if (SLOT_COUNT >= 2) CXINC; 684 if (SLOT_COUNT >= 2) CXINC;
574 if (SLOT_COUNT >= 3) CXINC; 685 if (SLOT_COUNT >= 3) CXINC;
575 { 686 {
576 int i; 687 unsigned int i;
577 for (i = 3; i < SLOT_COUNT; ++i) 688 for (i = 3; i < SLOT_COUNT; ++i)
578 CXINC; 689 CXINC;
579 } 690 }
580 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 691 cxstack_ix -= SLOT_COUNT; /* undo allocation */
581 692
582 c->mainstack = PL_mainstack; 693 c->mainstack = PL_mainstack;
583 694
584 { 695 {
585 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 696 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
586 697
587 slot->defav = GvAV (PL_defgv); 698 slot->defav = GvAV (PL_defgv);
588 slot->defsv = DEFSV; 699 slot->defsv = DEFSV;
589 slot->errsv = ERRSV; 700 slot->errsv = ERRSV;
590 slot->irsgv = GvSV (irsgv); 701 slot->irsgv = GvSV (irsgv);
702 slot->hinthv = GvHV (PL_hintgv);
591 703
592 #define VAR(name,type) slot->name = PL_ ## name; 704 #define VAR(name,type) slot->name = PL_ ## name;
593 # include "state.h" 705 # include "state.h"
594 #undef VAR 706 #undef VAR
595 } 707 }
… …
600 * of perl.c:init_stacks, except that it uses less memory 712 * of perl.c:init_stacks, except that it uses less memory
601 * on the (sometimes correct) assumption that coroutines do 713 * on the (sometimes correct) assumption that coroutines do
602 * not usually need a lot of stackspace. 714 * not usually need a lot of stackspace.
603 */ 715 */
604#if CORO_PREFER_PERL_FUNCTIONS 716#if CORO_PREFER_PERL_FUNCTIONS
605# define coro_init_stacks init_stacks 717# define coro_init_stacks(thx) init_stacks ()
606#else 718#else
607static void 719static void
608coro_init_stacks (pTHX) 720coro_init_stacks (pTHX)
609{ 721{
610 PL_curstackinfo = new_stackinfo(32, 8); 722 PL_curstackinfo = new_stackinfo(32, 8);
… …
673#if !PERL_VERSION_ATLEAST (5,10,0) 785#if !PERL_VERSION_ATLEAST (5,10,0)
674 Safefree (PL_retstack); 786 Safefree (PL_retstack);
675#endif 787#endif
676} 788}
677 789
790#define CORO_RSS \
791 rss += sizeof (SYM (curstackinfo)); \
792 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
793 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
794 rss += SYM (tmps_max) * sizeof (SV *); \
795 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
796 rss += SYM (scopestack_max) * sizeof (I32); \
797 rss += SYM (savestack_max) * sizeof (ANY);
798
678static size_t 799static size_t
679coro_rss (pTHX_ struct coro *coro) 800coro_rss (pTHX_ struct coro *coro)
680{ 801{
681 size_t rss = sizeof (*coro); 802 size_t rss = sizeof (*coro);
682 803
683 if (coro->mainstack) 804 if (coro->mainstack)
684 { 805 {
685 perl_slots tmp_slot;
686 perl_slots *slot;
687
688 if (coro->flags & CF_RUNNING) 806 if (coro->flags & CF_RUNNING)
689 { 807 {
690 slot = &tmp_slot; 808 #define SYM(sym) PL_ ## sym
691 809 CORO_RSS;
692 #define VAR(name,type) slot->name = PL_ ## name;
693 # include "state.h"
694 #undef VAR 810 #undef SYM
695 } 811 }
696 else 812 else
697 slot = coro->slot;
698
699 if (slot)
700 { 813 {
701 rss += sizeof (slot->curstackinfo); 814 #define SYM(sym) coro->slot->sym
702 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 815 CORO_RSS;
703 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 816 #undef SYM
704 rss += slot->tmps_max * sizeof (SV *);
705 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
706 rss += slot->scopestack_max * sizeof (I32);
707 rss += slot->savestack_max * sizeof (ANY);
708
709#if !PERL_VERSION_ATLEAST (5,10,0)
710 rss += slot->retstack_max * sizeof (OP *);
711#endif
712 } 817 }
713 } 818 }
714 819
715 return rss; 820 return rss;
716} 821}
… …
729#endif 834#endif
730 835
731/* 836/*
732 * This overrides the default magic get method of %SIG elements. 837 * This overrides the default magic get method of %SIG elements.
733 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 838 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
734 * and instead of tryign to save and restore the hash elements, we just provide 839 * and instead of trying to save and restore the hash elements, we just provide
735 * readback here. 840 * readback here.
736 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
737 * not expecting this to actually change the hook. This is a potential problem
738 * when a schedule happens then, but we ignore this.
739 */ 841 */
740static int 842static int
741coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 843coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
742{ 844{
743 const char *s = MgPV_nolen_const (mg); 845 const char *s = MgPV_nolen_const (mg);
… …
796 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 898 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
797 899
798 if (svp) 900 if (svp)
799 { 901 {
800 SV *old = *svp; 902 SV *old = *svp;
801 *svp = newSVsv (sv); 903 *svp = SvOK (sv) ? newSVsv (sv) : 0;
802 SvREFCNT_dec (old); 904 SvREFCNT_dec (old);
803 return 0; 905 return 0;
804 } 906 }
805 } 907 }
806 908
… …
816 918
817static int 919static int
818slf_check_nop (pTHX_ struct CoroSLF *frame) 920slf_check_nop (pTHX_ struct CoroSLF *frame)
819{ 921{
820 return 0; 922 return 0;
923}
924
925static int
926slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{
928 return 1;
821} 929}
822 930
823static UNOP coro_setup_op; 931static UNOP coro_setup_op;
824 932
825static void NOINLINE /* noinline to keep it out of the transfer fast path */ 933static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
832 940
833 PL_runops = RUNOPS_DEFAULT; 941 PL_runops = RUNOPS_DEFAULT;
834 PL_curcop = &PL_compiling; 942 PL_curcop = &PL_compiling;
835 PL_in_eval = EVAL_NULL; 943 PL_in_eval = EVAL_NULL;
836 PL_comppad = 0; 944 PL_comppad = 0;
945 PL_comppad_name = 0;
946 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0;
837 PL_curpm = 0; 948 PL_curpm = 0;
838 PL_curpad = 0; 949 PL_curpad = 0;
839 PL_localizing = 0; 950 PL_localizing = 0;
840 PL_dirty = 0; 951 PL_dirty = 0;
841 PL_restartop = 0; 952 PL_restartop = 0;
842#if PERL_VERSION_ATLEAST (5,10,0) 953#if PERL_VERSION_ATLEAST (5,10,0)
843 PL_parser = 0; 954 PL_parser = 0;
844#endif 955#endif
956 PL_hints = 0;
845 957
846 /* recreate the die/warn hooks */ 958 /* recreate the die/warn hooks */
847 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 959 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
848 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 960 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
849 961
850 GvSV (PL_defgv) = newSV (0); 962 GvSV (PL_defgv) = newSV (0);
851 GvAV (PL_defgv) = coro->args; coro->args = 0; 963 GvAV (PL_defgv) = coro->args; coro->args = 0;
852 GvSV (PL_errgv) = newSV (0); 964 GvSV (PL_errgv) = newSV (0);
853 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 965 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
966 GvHV (PL_hintgv) = 0;
854 PL_rs = newSVsv (GvSV (irsgv)); 967 PL_rs = newSVsv (GvSV (irsgv));
855 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 968 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
856 969
857 { 970 {
858 dSP; 971 dSP;
859 UNOP myop; 972 UNOP myop;
860 973
861 Zero (&myop, 1, UNOP); 974 Zero (&myop, 1, UNOP);
862 myop.op_next = Nullop; 975 myop.op_next = Nullop;
976 myop.op_type = OP_ENTERSUB;
863 myop.op_flags = OPf_WANT_VOID; 977 myop.op_flags = OPf_WANT_VOID;
864 978
865 PUSHMARK (SP); 979 PUSHMARK (SP);
866 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 980 PUSHs ((SV *)coro->startcv);
867 PUTBACK; 981 PUTBACK;
868 PL_op = (OP *)&myop; 982 PL_op = (OP *)&myop;
869 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 983 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
870 SPAGAIN;
871 } 984 }
872 985
873 /* this newly created coroutine might be run on an existing cctx which most 986 /* this newly created coroutine might be run on an existing cctx which most
874 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 987 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
875 */ 988 */
876 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
877 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
878 991
879 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op;
880 coro_setup_op.op_type = OP_CUSTOM; 994 coro_setup_op.op_type = OP_ENTERSUB;
881 coro_setup_op.op_ppaddr = pp_slf; 995 coro_setup_op.op_ppaddr = pp_slf;
882 coro_setup_op.op_next = PL_op; 996 /* no flags etc. required, as an init function won't be called */
883 997
884 PL_op = (OP *)&coro_setup_op; 998 PL_op = (OP *)&coro_setup_op;
885 999
886 /* copy throw, in case it was set before coro_setup */ 1000 /* copy throw, in case it was set before coro_setup */
887 coro_throw = coro->throw; 1001 CORO_THROW = coro->except;
888}
889 1002
1003 if (expect_false (enable_times))
1004 {
1005 coro_times_update ();
1006 coro_times_sub (coro);
1007 }
1008}
1009
890static void 1010static void
891coro_destruct (pTHX_ struct coro *coro) 1011coro_unwind_stacks (pTHX)
892{ 1012{
893 if (!IN_DESTRUCT) 1013 if (!IN_DESTRUCT)
894 { 1014 {
895 /* restore all saved variables and stuff */ 1015 /* restore all saved variables and stuff */
896 LEAVE_SCOPE (0); 1016 LEAVE_SCOPE (0);
… …
904 POPSTACK_TO (PL_mainstack); 1024 POPSTACK_TO (PL_mainstack);
905 1025
906 /* unwind main stack */ 1026 /* unwind main stack */
907 dounwind (-1); 1027 dounwind (-1);
908 } 1028 }
1029}
909 1030
910 SvREFCNT_dec (GvSV (PL_defgv)); 1031static void
911 SvREFCNT_dec (GvAV (PL_defgv)); 1032coro_destruct_perl (pTHX_ struct coro *coro)
912 SvREFCNT_dec (GvSV (PL_errgv)); 1033{
913 SvREFCNT_dec (PL_defoutgv); 1034 SV *svf [9];
914 SvREFCNT_dec (PL_rs);
915 SvREFCNT_dec (GvSV (irsgv));
916 1035
917 SvREFCNT_dec (PL_diehook);
918 SvREFCNT_dec (PL_warnhook);
919 1036 {
1037 struct coro *current = SvSTATE_current;
1038
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040
1041 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro);
1043
1044 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX);
1046
1047 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv);
1051 svf [3] = (SV *)PL_defoutgv;
1052 svf [4] = PL_rs;
1053 svf [5] = GvSV (irsgv);
1054 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf));
1058
1059 load_perl (aTHX_ current);
1060 }
1061
1062 {
1063 unsigned int i;
1064
1065 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1066 SvREFCNT_dec (svf [i]);
1067
920 SvREFCNT_dec (coro->saved_deffh); 1068 SvREFCNT_dec (coro->saved_deffh);
921 SvREFCNT_dec (coro_throw); 1069 SvREFCNT_dec (coro->rouse_cb);
922 1070 SvREFCNT_dec (coro->invoke_cb);
923 coro_destruct_stacks (aTHX); 1071 SvREFCNT_dec (coro->invoke_av);
1072 }
924} 1073}
925 1074
926INLINE void 1075INLINE void
927free_coro_mortal (pTHX) 1076free_coro_mortal (pTHX)
928{ 1077{
… …
936static int 1085static int
937runops_trace (pTHX) 1086runops_trace (pTHX)
938{ 1087{
939 COP *oldcop = 0; 1088 COP *oldcop = 0;
940 int oldcxix = -2; 1089 int oldcxix = -2;
941 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
942 coro_cctx *cctx = coro->cctx;
943 1090
944 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1091 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
945 { 1092 {
946 PERL_ASYNC_CHECK (); 1093 PERL_ASYNC_CHECK ();
947 1094
948 if (cctx->flags & CC_TRACE_ALL) 1095 if (cctx_current->flags & CC_TRACE_ALL)
949 { 1096 {
950 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1097 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
951 { 1098 {
952 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1099 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
953 SV **bot, **top; 1100 SV **bot, **top;
954 AV *av = newAV (); /* return values */ 1101 AV *av = newAV (); /* return values */
955 SV **cb; 1102 SV **cb;
… …
992 1139
993 if (PL_curcop != &PL_compiling) 1140 if (PL_curcop != &PL_compiling)
994 { 1141 {
995 SV **cb; 1142 SV **cb;
996 1143
997 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1144 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
998 { 1145 {
999 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1146 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1000 1147
1001 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1148 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1002 { 1149 {
1003 runops_proc_t old_runops = PL_runops;
1004 dSP; 1150 dSP;
1005 GV *gv = CvGV (cx->blk_sub.cv); 1151 GV *gv = CvGV (cx->blk_sub.cv);
1006 SV *fullname = sv_2mortal (newSV (0)); 1152 SV *fullname = sv_2mortal (newSV (0));
1007 1153
1008 if (isGV (gv)) 1154 if (isGV (gv))
… …
1013 SAVETMPS; 1159 SAVETMPS;
1014 EXTEND (SP, 3); 1160 EXTEND (SP, 3);
1015 PUSHMARK (SP); 1161 PUSHMARK (SP);
1016 PUSHs (&PL_sv_yes); 1162 PUSHs (&PL_sv_yes);
1017 PUSHs (fullname); 1163 PUSHs (fullname);
1018 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1164 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1019 PUTBACK; 1165 PUTBACK;
1020 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1166 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1021 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1167 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1022 SPAGAIN; 1168 SPAGAIN;
1023 FREETMPS; 1169 FREETMPS;
… …
1026 } 1172 }
1027 1173
1028 oldcxix = cxstack_ix; 1174 oldcxix = cxstack_ix;
1029 } 1175 }
1030 1176
1031 if (cctx->flags & CC_TRACE_LINE) 1177 if (cctx_current->flags & CC_TRACE_LINE)
1032 { 1178 {
1033 dSP; 1179 dSP;
1034 1180
1035 PL_runops = RUNOPS_DEFAULT; 1181 PL_runops = RUNOPS_DEFAULT;
1036 ENTER; 1182 ENTER;
… …
1055 1201
1056 TAINT_NOT; 1202 TAINT_NOT;
1057 return 0; 1203 return 0;
1058} 1204}
1059 1205
1060static struct coro_cctx *cctx_ssl_cctx;
1061static struct CoroSLF cctx_ssl_frame; 1206static struct CoroSLF cctx_ssl_frame;
1062 1207
1063static void 1208static void
1064slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1209slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1065{ 1210{
1066 ta->prev = (struct coro *)cctx_ssl_cctx;
1067 ta->next = 0; 1211 ta->prev = 0;
1068} 1212}
1069 1213
1070static int 1214static int
1071slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1215slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1072{ 1216{
1073 *frame = cctx_ssl_frame; 1217 *frame = cctx_ssl_frame;
1074 1218
1075 return 1; /* execute the restored frame - there must be one */ 1219 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1076} 1220}
1077 1221
1078/* initialises PL_top_env and injects a pseudo-slf-call to sett he stacklevel */ 1222/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1079static void NOINLINE 1223static void NOINLINE
1080cctx_prepare (pTHX_ coro_cctx *cctx) 1224cctx_prepare (pTHX)
1081{ 1225{
1082 PL_top_env = &PL_start_env; 1226 PL_top_env = &PL_start_env;
1083 1227
1084 if (cctx->flags & CC_TRACE) 1228 if (cctx_current->flags & CC_TRACE)
1085 PL_runops = runops_trace; 1229 PL_runops = runops_trace;
1086 1230
1087 /* we already must be executing an SLF op, there is no other valid way 1231 /* we already must be executing an SLF op, there is no other valid way
1088 * that can lead to creation of a new cctx */ 1232 * that can lead to creation of a new cctx */
1089 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1233 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1090 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1234 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1091 1235
1092 cctx_ssl_cctx = cctx; 1236 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1093 cctx_ssl_frame = slf_frame; 1237 cctx_ssl_frame = slf_frame;
1094 1238
1095 slf_frame.prepare = slf_prepare_set_stacklevel; 1239 slf_frame.prepare = slf_prepare_set_stacklevel;
1096 slf_frame.check = slf_check_set_stacklevel; 1240 slf_frame.check = slf_check_set_stacklevel;
1097} 1241}
… …
1120 /* normally we would need to skip the entersub here */ 1264 /* normally we would need to skip the entersub here */
1121 /* not doing so will re-execute it, which is exactly what we want */ 1265 /* not doing so will re-execute it, which is exactly what we want */
1122 /* PL_nop = PL_nop->op_next */ 1266 /* PL_nop = PL_nop->op_next */
1123 1267
1124 /* inject a fake subroutine call to cctx_init */ 1268 /* inject a fake subroutine call to cctx_init */
1125 cctx_prepare (aTHX_ (coro_cctx *)arg); 1269 cctx_prepare (aTHX);
1126 1270
1127 /* cctx_run is the alternative tail of transfer() */ 1271 /* cctx_run is the alternative tail of transfer() */
1128 transfer_tail (aTHX); 1272 transfer_tail (aTHX);
1129 1273
1130 /* somebody or something will hit me for both perl_run and PL_restartop */ 1274 /* somebody or something will hit me for both perl_run and PL_restartop */
1131 PL_restartop = PL_op; 1275 PL_restartop = PL_op;
1132 perl_run (PL_curinterp); 1276 perl_run (PL_curinterp);
1277 /*
1278 * Unfortunately, there is no way to get at the return values of the
1279 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1280 * runtime errors here, as this is just a random interpreter, not a thread.
1281 */
1133 1282
1134 /* 1283 /*
1135 * If perl-run returns we assume exit() was being called or the coro 1284 * If perl-run returns we assume exit() was being called or the coro
1136 * fell off the end, which seems to be the only valid (non-bug) 1285 * fell off the end, which seems to be the only valid (non-bug)
1137 * reason for perl_run to return. We try to exit by jumping to the 1286 * reason for perl_run to return. We try to exit by jumping to the
1138 * bootstrap-time "top" top_env, as we cannot restore the "main" 1287 * bootstrap-time "top" top_env, as we cannot restore the "main"
1139 * coroutine as Coro has no such concept 1288 * coroutine as Coro has no such concept.
1289 * This actually isn't valid with the pthread backend, but OSes requiring
1290 * that backend are too broken to do it in a standards-compliant way.
1140 */ 1291 */
1141 PL_top_env = main_top_env; 1292 PL_top_env = main_top_env;
1142 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1293 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1143 } 1294 }
1144} 1295}
… …
1221cctx_destroy (coro_cctx *cctx) 1372cctx_destroy (coro_cctx *cctx)
1222{ 1373{
1223 if (!cctx) 1374 if (!cctx)
1224 return; 1375 return;
1225 1376
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1378
1226 --cctx_count; 1379 --cctx_count;
1227 coro_destroy (&cctx->cctx); 1380 coro_destroy (&cctx->cctx);
1228 1381
1229 /* coro_transfer creates new, empty cctx's */ 1382 /* coro_transfer creates new, empty cctx's */
1230 if (cctx->sptr) 1383 if (cctx->sptr)
… …
1293 /* TODO: throwing up here is considered harmful */ 1446 /* TODO: throwing up here is considered harmful */
1294 1447
1295 if (expect_true (prev != next)) 1448 if (expect_true (prev != next))
1296 { 1449 {
1297 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1450 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1298 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1451 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1299 1452
1300 if (expect_false (next->flags & CF_RUNNING))
1301 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1302
1303 if (expect_false (next->flags & CF_DESTROYED)) 1453 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1304 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1454 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1305 1455
1306#if !PERL_VERSION_ATLEAST (5,10,0) 1456#if !PERL_VERSION_ATLEAST (5,10,0)
1307 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1457 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1308 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1458 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1309#endif 1459#endif
… …
1315transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1465transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1316{ 1466{
1317 dSTACKLEVEL; 1467 dSTACKLEVEL;
1318 1468
1319 /* sometimes transfer is only called to set idle_sp */ 1469 /* sometimes transfer is only called to set idle_sp */
1320 if (expect_false (!next)) 1470 if (expect_false (!prev))
1321 { 1471 {
1322 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel; 1472 cctx_current->idle_sp = STACKLEVEL;
1323 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1473 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1324 } 1474 }
1325 else if (expect_true (prev != next)) 1475 else if (expect_true (prev != next))
1326 { 1476 {
1327 coro_cctx *prev__cctx; 1477 coro_cctx *cctx_prev;
1328 1478
1329 if (expect_false (prev->flags & CF_NEW)) 1479 if (expect_false (prev->flags & CF_NEW))
1330 { 1480 {
1331 /* create a new empty/source context */ 1481 /* create a new empty/source context */
1332 prev->cctx = cctx_new_empty ();
1333 prev->flags &= ~CF_NEW; 1482 prev->flags &= ~CF_NEW;
1334 prev->flags |= CF_RUNNING; 1483 prev->flags |= CF_RUNNING;
1335 } 1484 }
1336 1485
1337 prev->flags &= ~CF_RUNNING; 1486 prev->flags &= ~CF_RUNNING;
… …
1348 coro_setup (aTHX_ next); 1497 coro_setup (aTHX_ next);
1349 } 1498 }
1350 else 1499 else
1351 load_perl (aTHX_ next); 1500 load_perl (aTHX_ next);
1352 1501
1353 prev__cctx = prev->cctx;
1354
1355 /* possibly untie and reuse the cctx */ 1502 /* possibly untie and reuse the cctx */
1356 if (expect_true ( 1503 if (expect_true (
1357 prev__cctx->idle_sp == (void *)stacklevel 1504 cctx_current->idle_sp == STACKLEVEL
1358 && !(prev__cctx->flags & CC_TRACE) 1505 && !(cctx_current->flags & CC_TRACE)
1359 && !force_cctx 1506 && !force_cctx
1360 )) 1507 ))
1361 { 1508 {
1362 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1509 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1363 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1510 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1364 1511
1365 prev->cctx = 0;
1366
1367 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1512 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1368 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1513 /* without this the next cctx_get might destroy the running cctx while still in use */
1369 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1514 if (expect_false (CCTX_EXPIRED (cctx_current)))
1370 if (!next->cctx) 1515 if (expect_true (!next->cctx))
1371 next->cctx = cctx_get (aTHX); 1516 next->cctx = cctx_get (aTHX);
1372 1517
1373 cctx_put (prev__cctx); 1518 cctx_put (cctx_current);
1374 } 1519 }
1520 else
1521 prev->cctx = cctx_current;
1375 1522
1376 ++next->usecount; 1523 ++next->usecount;
1377 1524
1378 if (expect_true (!next->cctx)) 1525 cctx_prev = cctx_current;
1379 next->cctx = cctx_get (aTHX); 1526 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1380 1527
1381 if (expect_false (prev__cctx != next->cctx)) 1528 next->cctx = 0;
1529
1530 if (expect_false (cctx_prev != cctx_current))
1382 { 1531 {
1383 prev__cctx->top_env = PL_top_env; 1532 cctx_prev->top_env = PL_top_env;
1384 PL_top_env = next->cctx->top_env; 1533 PL_top_env = cctx_current->top_env;
1385 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1534 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1386 } 1535 }
1387 1536
1388 transfer_tail (aTHX); 1537 transfer_tail (aTHX);
1389 } 1538 }
1390} 1539}
… …
1398coro_state_destroy (pTHX_ struct coro *coro) 1547coro_state_destroy (pTHX_ struct coro *coro)
1399{ 1548{
1400 if (coro->flags & CF_DESTROYED) 1549 if (coro->flags & CF_DESTROYED)
1401 return 0; 1550 return 0;
1402 1551
1403 if (coro->on_destroy) 1552 if (coro->on_destroy && !PL_dirty)
1404 coro->on_destroy (aTHX_ coro); 1553 coro->on_destroy (aTHX_ coro);
1405 1554
1406 coro->flags |= CF_DESTROYED; 1555 coro->flags |= CF_DESTROYED;
1407 1556
1408 if (coro->flags & CF_READY) 1557 if (coro->flags & CF_READY)
… …
1412 --coro_nready; 1561 --coro_nready;
1413 } 1562 }
1414 else 1563 else
1415 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1564 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1416 1565
1417 if (coro->mainstack && coro->mainstack != main_mainstack) 1566 if (coro->mainstack
1418 { 1567 && coro->mainstack != main_mainstack
1419 struct coro temp; 1568 && coro->slot
1420 1569 && !PL_dirty)
1421 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1422
1423 save_perl (aTHX_ &temp);
1424 load_perl (aTHX_ coro);
1425
1426 coro_destruct (aTHX_ coro); 1570 coro_destruct_perl (aTHX_ coro);
1427
1428 load_perl (aTHX_ &temp);
1429
1430 coro->slot = 0;
1431 }
1432 1571
1433 cctx_destroy (coro->cctx); 1572 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv);
1434 SvREFCNT_dec (coro->args); 1574 SvREFCNT_dec (coro->args);
1575 SvREFCNT_dec (CORO_THROW);
1435 1576
1436 if (coro->next) coro->next->prev = coro->prev; 1577 if (coro->next) coro->next->prev = coro->prev;
1437 if (coro->prev) coro->prev->next = coro->next; 1578 if (coro->prev) coro->prev->next = coro->next;
1438 if (coro == coro_first) coro_first = coro->next; 1579 if (coro == coro_first) coro_first = coro->next;
1439 1580
… …
1498/** Coro ********************************************************************/ 1639/** Coro ********************************************************************/
1499 1640
1500INLINE void 1641INLINE void
1501coro_enq (pTHX_ struct coro *coro) 1642coro_enq (pTHX_ struct coro *coro)
1502{ 1643{
1503 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1644 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1504}
1505 1645
1506INLINE SV * 1646 SvREFCNT_inc_NN (coro->hv);
1647
1648 coro->next_ready = 0;
1649 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1650 ready [1] = coro;
1651}
1652
1653INLINE struct coro *
1507coro_deq (pTHX) 1654coro_deq (pTHX)
1508{ 1655{
1509 int prio; 1656 int prio;
1510 1657
1511 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1658 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1512 if (AvFILLp (coro_ready [prio]) >= 0) 1659 {
1513 return av_shift (coro_ready [prio]); 1660 struct coro **ready = coro_ready [prio];
1661
1662 if (ready [0])
1663 {
1664 struct coro *coro = ready [0];
1665 ready [0] = coro->next_ready;
1666 return coro;
1667 }
1668 }
1514 1669
1515 return 0; 1670 return 0;
1671}
1672
1673static void
1674invoke_sv_ready_hook_helper (void)
1675{
1676 dTHX;
1677 dSP;
1678
1679 ENTER;
1680 SAVETMPS;
1681
1682 PUSHMARK (SP);
1683 PUTBACK;
1684 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1685
1686 FREETMPS;
1687 LEAVE;
1516} 1688}
1517 1689
1518static int 1690static int
1519api_ready (pTHX_ SV *coro_sv) 1691api_ready (pTHX_ SV *coro_sv)
1520{ 1692{
1521 struct coro *coro;
1522 SV *sv_hook;
1523 void (*xs_hook)(void);
1524
1525 if (SvROK (coro_sv))
1526 coro_sv = SvRV (coro_sv);
1527
1528 coro = SvSTATE (coro_sv); 1693 struct coro *coro = SvSTATE (coro_sv);
1529 1694
1530 if (coro->flags & CF_READY) 1695 if (coro->flags & CF_READY)
1531 return 0; 1696 return 0;
1532 1697
1533 coro->flags |= CF_READY; 1698 coro->flags |= CF_READY;
1534 1699
1535 sv_hook = coro_nready ? 0 : coro_readyhook;
1536 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1537
1538 coro_enq (aTHX_ coro); 1700 coro_enq (aTHX_ coro);
1539 ++coro_nready;
1540 1701
1541 if (sv_hook) 1702 if (!coro_nready++)
1542 { 1703 if (coroapi.readyhook)
1543 dSP; 1704 coroapi.readyhook ();
1544
1545 ENTER;
1546 SAVETMPS;
1547
1548 PUSHMARK (SP);
1549 PUTBACK;
1550 call_sv (sv_hook, G_VOID | G_DISCARD);
1551
1552 FREETMPS;
1553 LEAVE;
1554 }
1555
1556 if (xs_hook)
1557 xs_hook ();
1558 1705
1559 return 1; 1706 return 1;
1560} 1707}
1561 1708
1562static int 1709static int
1563api_is_ready (pTHX_ SV *coro_sv) 1710api_is_ready (pTHX_ SV *coro_sv)
1564{ 1711{
1565 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1712 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1566} 1713}
1567 1714
1715/* expects to own a reference to next->hv */
1568INLINE void 1716INLINE void
1569prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1717prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1570{ 1718{
1571 SV *prev_sv, *next_sv;
1572
1573 for (;;)
1574 {
1575 next_sv = coro_deq (aTHX);
1576
1577 /* nothing to schedule: call the idle handler */
1578 if (expect_false (!next_sv))
1579 {
1580 dSP;
1581
1582 ENTER;
1583 SAVETMPS;
1584
1585 PUSHMARK (SP);
1586 PUTBACK;
1587 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1588
1589 FREETMPS;
1590 LEAVE;
1591 continue;
1592 }
1593
1594 ta->next = SvSTATE_hv (next_sv);
1595
1596 /* cannot transfer to destroyed coros, skip and look for next */
1597 if (expect_false (ta->next->flags & CF_DESTROYED))
1598 {
1599 SvREFCNT_dec (next_sv);
1600 /* coro_nready has already been taken care of by destroy */
1601 continue;
1602 }
1603
1604 --coro_nready;
1605 break;
1606 }
1607
1608 /* free this only after the transfer */
1609 prev_sv = SvRV (coro_current); 1719 SV *prev_sv = SvRV (coro_current);
1720
1610 ta->prev = SvSTATE_hv (prev_sv); 1721 ta->prev = SvSTATE_hv (prev_sv);
1722 ta->next = next;
1723
1611 TRANSFER_CHECK (*ta); 1724 TRANSFER_CHECK (*ta);
1612 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1725
1613 ta->next->flags &= ~CF_READY;
1614 SvRV_set (coro_current, next_sv); 1726 SvRV_set (coro_current, (SV *)next->hv);
1615 1727
1616 free_coro_mortal (aTHX); 1728 free_coro_mortal (aTHX);
1617 coro_mortal = prev_sv; 1729 coro_mortal = prev_sv;
1618} 1730}
1619 1731
1732static void
1733prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1734{
1735 for (;;)
1736 {
1737 struct coro *next = coro_deq (aTHX);
1738
1739 if (expect_true (next))
1740 {
1741 /* cannot transfer to destroyed coros, skip and look for next */
1742 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1743 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1744 else
1745 {
1746 next->flags &= ~CF_READY;
1747 --coro_nready;
1748
1749 prepare_schedule_to (aTHX_ ta, next);
1750 break;
1751 }
1752 }
1753 else
1754 {
1755 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle)))
1758 {
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready;
1762 }
1763 else
1764 {
1765 dSP;
1766
1767 ENTER;
1768 SAVETMPS;
1769
1770 PUSHMARK (SP);
1771 PUTBACK;
1772 call_sv (sv_idle, G_VOID | G_DISCARD);
1773
1774 FREETMPS;
1775 LEAVE;
1776 }
1777 }
1778 }
1779}
1780
1620INLINE void 1781INLINE void
1621prepare_cede (pTHX_ struct coro_transfer_args *ta) 1782prepare_cede (pTHX_ struct coro_transfer_args *ta)
1622{ 1783{
1623 api_ready (aTHX_ coro_current); 1784 api_ready (aTHX_ coro_current);
1624 prepare_schedule (aTHX_ ta); 1785 prepare_schedule (aTHX_ ta);
… …
1643{ 1804{
1644 struct coro_transfer_args ta; 1805 struct coro_transfer_args ta;
1645 1806
1646 prepare_schedule (aTHX_ &ta); 1807 prepare_schedule (aTHX_ &ta);
1647 TRANSFER (ta, 1); 1808 TRANSFER (ta, 1);
1809}
1810
1811static void
1812api_schedule_to (pTHX_ SV *coro_sv)
1813{
1814 struct coro_transfer_args ta;
1815 struct coro *next = SvSTATE (coro_sv);
1816
1817 SvREFCNT_inc_NN (coro_sv);
1818 prepare_schedule_to (aTHX_ &ta, next);
1648} 1819}
1649 1820
1650static int 1821static int
1651api_cede (pTHX) 1822api_cede (pTHX)
1652{ 1823{
… …
1681static void 1852static void
1682api_trace (pTHX_ SV *coro_sv, int flags) 1853api_trace (pTHX_ SV *coro_sv, int flags)
1683{ 1854{
1684 struct coro *coro = SvSTATE (coro_sv); 1855 struct coro *coro = SvSTATE (coro_sv);
1685 1856
1857 if (coro->flags & CF_RUNNING)
1858 croak ("cannot enable tracing on a running coroutine, caught");
1859
1686 if (flags & CC_TRACE) 1860 if (flags & CC_TRACE)
1687 { 1861 {
1688 if (!coro->cctx) 1862 if (!coro->cctx)
1689 coro->cctx = cctx_new_run (); 1863 coro->cctx = cctx_new_run ();
1690 else if (!(coro->cctx->flags & CC_TRACE)) 1864 else if (!(coro->cctx->flags & CC_TRACE))
1691 croak ("cannot enable tracing on coroutine with custom stack,"); 1865 croak ("cannot enable tracing on coroutine with custom stack, caught");
1692 1866
1693 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1867 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1694 } 1868 }
1695 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1869 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1696 { 1870 {
… …
1699 if (coro->flags & CF_RUNNING) 1873 if (coro->flags & CF_RUNNING)
1700 PL_runops = RUNOPS_DEFAULT; 1874 PL_runops = RUNOPS_DEFAULT;
1701 else 1875 else
1702 coro->slot->runops = RUNOPS_DEFAULT; 1876 coro->slot->runops = RUNOPS_DEFAULT;
1703 } 1877 }
1878}
1879
1880static void
1881coro_call_on_destroy (pTHX_ struct coro *coro)
1882{
1883 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1884 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1885
1886 if (on_destroyp)
1887 {
1888 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1889
1890 while (AvFILLp (on_destroy) >= 0)
1891 {
1892 dSP; /* don't disturb outer sp */
1893 SV *cb = av_pop (on_destroy);
1894
1895 PUSHMARK (SP);
1896
1897 if (statusp)
1898 {
1899 int i;
1900 AV *status = (AV *)SvRV (*statusp);
1901 EXTEND (SP, AvFILLp (status) + 1);
1902
1903 for (i = 0; i <= AvFILLp (status); ++i)
1904 PUSHs (AvARRAY (status)[i]);
1905 }
1906
1907 PUTBACK;
1908 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1909 }
1910 }
1911}
1912
1913static void
1914slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1915{
1916 int i;
1917 HV *hv = (HV *)SvRV (coro_current);
1918 AV *av = newAV ();
1919
1920 /* items are actually not so common, so optimise for this case */
1921 if (items)
1922 {
1923 av_extend (av, items - 1);
1924
1925 for (i = 0; i < items; ++i)
1926 av_push (av, SvREFCNT_inc_NN (arg [i]));
1927 }
1928
1929 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1930
1931 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1932 api_ready (aTHX_ sv_manager);
1933
1934 frame->prepare = prepare_schedule;
1935 frame->check = slf_check_repeat;
1936
1937 /* as a minor optimisation, we could unwind all stacks here */
1938 /* but that puts extra pressure on pp_slf, and is not worth much */
1939 /*coro_unwind_stacks (aTHX);*/
1940}
1941
1942/*****************************************************************************/
1943/* async pool handler */
1944
1945static int
1946slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
1947{
1948 HV *hv = (HV *)SvRV (coro_current);
1949 struct coro *coro = (struct coro *)frame->data;
1950
1951 if (!coro->invoke_cb)
1952 return 1; /* loop till we have invoke */
1953 else
1954 {
1955 hv_store (hv, "desc", sizeof ("desc") - 1,
1956 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1957
1958 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1959
1960 {
1961 dSP;
1962 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
1963 PUTBACK;
1964 }
1965
1966 SvREFCNT_dec (GvAV (PL_defgv));
1967 GvAV (PL_defgv) = coro->invoke_av;
1968 coro->invoke_av = 0;
1969
1970 return 0;
1971 }
1972}
1973
1974static void
1975slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1976{
1977 HV *hv = (HV *)SvRV (coro_current);
1978 struct coro *coro = SvSTATE_hv ((SV *)hv);
1979
1980 if (expect_true (coro->saved_deffh))
1981 {
1982 /* subsequent iteration */
1983 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1984 coro->saved_deffh = 0;
1985
1986 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1987 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1988 {
1989 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
1990 coro->invoke_av = newAV ();
1991
1992 frame->prepare = prepare_nop;
1993 }
1994 else
1995 {
1996 av_clear (GvAV (PL_defgv));
1997 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
1998
1999 coro->prio = 0;
2000
2001 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2002 api_trace (aTHX_ coro_current, 0);
2003
2004 frame->prepare = prepare_schedule;
2005 av_push (av_async_pool, SvREFCNT_inc (hv));
2006 }
2007 }
2008 else
2009 {
2010 /* first iteration, simply fall through */
2011 frame->prepare = prepare_nop;
2012 }
2013
2014 frame->check = slf_check_pool_handler;
2015 frame->data = (void *)coro;
2016}
2017
2018/*****************************************************************************/
2019/* rouse callback */
2020
2021#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
2022
2023static void
2024coro_rouse_callback (pTHX_ CV *cv)
2025{
2026 dXSARGS;
2027 SV *data = (SV *)S_GENSUB_ARG;
2028
2029 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2030 {
2031 /* first call, set args */
2032 SV *coro = SvRV (data);
2033 AV *av = newAV ();
2034
2035 SvRV_set (data, (SV *)av);
2036
2037 /* better take a full copy of the arguments */
2038 while (items--)
2039 av_store (av, items, newSVsv (ST (items)));
2040
2041 api_ready (aTHX_ coro);
2042 SvREFCNT_dec (coro);
2043 }
2044
2045 XSRETURN_EMPTY;
2046}
2047
2048static int
2049slf_check_rouse_wait (pTHX_ struct CoroSLF *frame)
2050{
2051 SV *data = (SV *)frame->data;
2052
2053 if (CORO_THROW)
2054 return 0;
2055
2056 if (SvTYPE (SvRV (data)) != SVt_PVAV)
2057 return 1;
2058
2059 /* now push all results on the stack */
2060 {
2061 dSP;
2062 AV *av = (AV *)SvRV (data);
2063 int i;
2064
2065 EXTEND (SP, AvFILLp (av) + 1);
2066 for (i = 0; i <= AvFILLp (av); ++i)
2067 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2068
2069 /* we have stolen the elements, so set length to zero and free */
2070 AvFILLp (av) = -1;
2071 av_undef (av);
2072
2073 PUTBACK;
2074 }
2075
2076 return 0;
2077}
2078
2079static void
2080slf_init_rouse_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2081{
2082 SV *cb;
2083
2084 if (items)
2085 cb = arg [0];
2086 else
2087 {
2088 struct coro *coro = SvSTATE_current;
2089
2090 if (!coro->rouse_cb)
2091 croak ("Coro::rouse_wait called without rouse callback, and no default rouse callback found either,");
2092
2093 cb = sv_2mortal (coro->rouse_cb);
2094 coro->rouse_cb = 0;
2095 }
2096
2097 if (!SvROK (cb)
2098 || SvTYPE (SvRV (cb)) != SVt_PVCV
2099 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
2100 croak ("Coro::rouse_wait called with illegal callback argument,");
2101
2102 {
2103 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2104 SV *data = (SV *)S_GENSUB_ARG;
2105
2106 frame->data = (void *)data;
2107 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2108 frame->check = slf_check_rouse_wait;
2109 }
2110}
2111
2112static SV *
2113coro_new_rouse_cb (pTHX)
2114{
2115 HV *hv = (HV *)SvRV (coro_current);
2116 struct coro *coro = SvSTATE_hv (hv);
2117 SV *data = newRV_inc ((SV *)hv);
2118 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2119
2120 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2121 SvREFCNT_dec (data); /* magicext increases the refcount */
2122
2123 SvREFCNT_dec (coro->rouse_cb);
2124 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2125
2126 return cb;
1704} 2127}
1705 2128
1706/*****************************************************************************/ 2129/*****************************************************************************/
1707/* schedule-like-function opcode (SLF) */ 2130/* schedule-like-function opcode (SLF) */
1708 2131
… …
1755static void 2178static void
1756slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2179slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1757{ 2180{
1758 frame->prepare = prepare_schedule; 2181 frame->prepare = prepare_schedule;
1759 frame->check = slf_check_nop; 2182 frame->check = slf_check_nop;
2183}
2184
2185static void
2186slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2187{
2188 struct coro *next = (struct coro *)slf_frame.data;
2189
2190 SvREFCNT_inc_NN (next->hv);
2191 prepare_schedule_to (aTHX_ ta, next);
2192}
2193
2194static void
2195slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2196{
2197 if (!items)
2198 croak ("Coro::schedule_to expects a coroutine argument, caught");
2199
2200 frame->data = (void *)SvSTATE (arg [0]);
2201 frame->prepare = slf_prepare_schedule_to;
2202 frame->check = slf_check_nop;
2203}
2204
2205static void
2206slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2207{
2208 api_ready (aTHX_ SvRV (coro_current));
2209
2210 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1760} 2211}
1761 2212
1762static void 2213static void
1763slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2214slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1764{ 2215{
… …
1835 } 2286 }
1836 while (slf_frame.check (aTHX_ &slf_frame)); 2287 while (slf_frame.check (aTHX_ &slf_frame));
1837 2288
1838 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */ 2289 slf_frame.prepare = 0; /* invalidate the frame, we are done processing it */
1839 2290
2291 /* exception handling */
2292 if (expect_false (CORO_THROW))
2293 {
2294 SV *exception = sv_2mortal (CORO_THROW);
2295
2296 CORO_THROW = 0;
2297 sv_setsv (ERRSV, exception);
2298 croak (0);
2299 }
2300
1840 /* return value handling - mostly like entersub */ 2301 /* return value handling - mostly like entersub */
1841 /* make sure we put something on the stack in scalar context */ 2302 /* make sure we put something on the stack in scalar context */
1842 if (GIMME_V == G_SCALAR) 2303 if (GIMME_V == G_SCALAR)
1843 { 2304 {
1844 dSP; 2305 dSP;
… …
1850 bot [1] = *sp; 2311 bot [1] = *sp;
1851 2312
1852 SP = bot + 1; 2313 SP = bot + 1;
1853 2314
1854 PUTBACK; 2315 PUTBACK;
1855 }
1856
1857 /* exception handling */
1858 if (expect_false (coro_throw))
1859 {
1860 SV *exception = sv_2mortal (coro_throw);
1861
1862 coro_throw = 0;
1863 sv_setsv (ERRSV, exception);
1864 croak (0);
1865 } 2316 }
1866 2317
1867 return NORMAL; 2318 return NORMAL;
1868} 2319}
1869 2320
… …
1910 } 2361 }
1911 else 2362 else
1912 slf_argc = 0; 2363 slf_argc = 0;
1913 2364
1914 PL_op->op_ppaddr = pp_slf; 2365 PL_op->op_ppaddr = pp_slf;
1915 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2366 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
1916 2367
1917 PL_op = (OP *)&slf_restore; 2368 PL_op = (OP *)&slf_restore;
2369}
2370
2371/*****************************************************************************/
2372/* dynamic wind */
2373
2374static void
2375on_enterleave_call (pTHX_ SV *cb)
2376{
2377 dSP;
2378
2379 PUSHSTACK;
2380
2381 PUSHMARK (SP);
2382 PUTBACK;
2383 call_sv (cb, G_VOID | G_DISCARD);
2384 SPAGAIN;
2385
2386 POPSTACK;
2387}
2388
2389static SV *
2390coro_avp_pop_and_free (pTHX_ AV **avp)
2391{
2392 AV *av = *avp;
2393 SV *res = av_pop (av);
2394
2395 if (AvFILLp (av) < 0)
2396 {
2397 *avp = 0;
2398 SvREFCNT_dec (av);
2399 }
2400
2401 return res;
2402}
2403
2404static void
2405coro_pop_on_enter (pTHX_ void *coro)
2406{
2407 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2408 SvREFCNT_dec (cb);
2409}
2410
2411static void
2412coro_pop_on_leave (pTHX_ void *coro)
2413{
2414 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2415 on_enterleave_call (aTHX_ sv_2mortal (cb));
1918} 2416}
1919 2417
1920/*****************************************************************************/ 2418/*****************************************************************************/
1921/* PerlIO::cede */ 2419/* PerlIO::cede */
1922 2420
… …
1991 PerlIOBuf_get_cnt, 2489 PerlIOBuf_get_cnt,
1992 PerlIOBuf_set_ptrcnt, 2490 PerlIOBuf_set_ptrcnt,
1993}; 2491};
1994 2492
1995/*****************************************************************************/ 2493/*****************************************************************************/
2494/* Coro::Semaphore & Coro::Signal */
2495
2496static SV *
2497coro_waitarray_new (pTHX_ int count)
2498{
2499 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2500 AV *av = newAV ();
2501 SV **ary;
2502
2503 /* unfortunately, building manually saves memory */
2504 Newx (ary, 2, SV *);
2505 AvALLOC (av) = ary;
2506#if PERL_VERSION_ATLEAST (5,10,0)
2507 AvARRAY (av) = ary;
2508#else
2509 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2510 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2511 SvPVX ((SV *)av) = (char *)ary;
2512#endif
2513 AvMAX (av) = 1;
2514 AvFILLp (av) = 0;
2515 ary [0] = newSViv (count);
2516
2517 return newRV_noinc ((SV *)av);
2518}
2519
1996/* Coro::Semaphore */ 2520/* semaphore */
1997 2521
1998static void 2522static void
1999coro_semaphore_adjust (pTHX_ AV *av, IV adjust) 2523coro_semaphore_adjust (pTHX_ AV *av, IV adjust)
2000{ 2524{
2001 SV *count_sv = AvARRAY (av)[0]; 2525 SV *count_sv = AvARRAY (av)[0];
… …
2013 AvARRAY (av)[0] = AvARRAY (av)[1]; 2537 AvARRAY (av)[0] = AvARRAY (av)[1];
2014 AvARRAY (av)[1] = count_sv; 2538 AvARRAY (av)[1] = count_sv;
2015 cb = av_shift (av); 2539 cb = av_shift (av);
2016 2540
2017 if (SvOBJECT (cb)) 2541 if (SvOBJECT (cb))
2542 {
2018 api_ready (aTHX_ cb); 2543 api_ready (aTHX_ cb);
2019 else 2544 --count;
2020 croak ("callbacks not yet supported"); 2545 }
2546 else if (SvTYPE (cb) == SVt_PVCV)
2547 {
2548 dSP;
2549 PUSHMARK (SP);
2550 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2551 PUTBACK;
2552 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2553 }
2021 2554
2022 SvREFCNT_dec (cb); 2555 SvREFCNT_dec (cb);
2023
2024 --count;
2025 } 2556 }
2026} 2557}
2027 2558
2028static void 2559static void
2029coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2560coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2031 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2562 /* call $sem->adjust (0) to possibly wake up some other waiters */
2032 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2563 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2033} 2564}
2034 2565
2035static int 2566static int
2036slf_check_semaphore_down (pTHX_ struct CoroSLF *frame) 2567slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2037{ 2568{
2038 AV *av = (AV *)frame->data; 2569 AV *av = (AV *)frame->data;
2039 SV *count_sv = AvARRAY (av)[0]; 2570 SV *count_sv = AvARRAY (av)[0];
2040 2571
2572 /* if we are about to throw, don't actually acquire the lock, just throw */
2573 if (CORO_THROW)
2574 return 0;
2041 if (SvIVX (count_sv) > 0) 2575 else if (SvIVX (count_sv) > 0)
2042 { 2576 {
2043 SvSTATE_current->on_destroy = 0; 2577 SvSTATE_current->on_destroy = 0;
2578
2579 if (acquire)
2044 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2580 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2581 else
2582 coro_semaphore_adjust (aTHX_ av, 0);
2583
2045 return 0; 2584 return 0;
2046 } 2585 }
2047 else 2586 else
2048 { 2587 {
2049 int i; 2588 int i;
… …
2058 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2597 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2059 return 1; 2598 return 1;
2060 } 2599 }
2061} 2600}
2062 2601
2063static void 2602static int
2603slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2604{
2605 return slf_check_semaphore_down_or_wait (aTHX_ frame, 1);
2606}
2607
2608static int
2609slf_check_semaphore_wait (pTHX_ struct CoroSLF *frame)
2610{
2611 return slf_check_semaphore_down_or_wait (aTHX_ frame, 0);
2612}
2613
2614static void
2064slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2615slf_init_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2065{ 2616{
2066 AV *av = (AV *)SvRV (arg [0]); 2617 AV *av = (AV *)SvRV (arg [0]);
2067 2618
2068 if (SvIVX (AvARRAY (av)[0]) > 0) 2619 if (SvIVX (AvARRAY (av)[0]) > 0)
2069 { 2620 {
2070 frame->data = (void *)av; 2621 frame->data = (void *)av;
2071 frame->prepare = prepare_nop; 2622 frame->prepare = prepare_nop;
2072 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2073 } 2623 }
2074 else 2624 else
2075 { 2625 {
2076 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2626 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2077 2627
2078 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2628 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2079 frame->prepare = prepare_schedule; 2629 frame->prepare = prepare_schedule;
2080 2630
2081 /* to avoid race conditions when a woken-up coro gets terminated */ 2631 /* to avoid race conditions when a woken-up coro gets terminated */
2082 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2632 /* we arrange for a temporary on_destroy that calls adjust (0) */
2083 assert (!SvSTATE_current->on_destroy);//D
2084 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2633 SvSTATE_current->on_destroy = coro_semaphore_on_destroy;
2085 } 2634 }
2635}
2086 2636
2637static void
2638slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2639{
2640 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2087 frame->check = slf_check_semaphore_down; 2641 frame->check = slf_check_semaphore_down;
2088
2089} 2642}
2090 2643
2091/*****************************************************************************/ 2644static void
2092/* gensub: simple closure generation utility */ 2645slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2093
2094#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2095
2096/* create a closure from XS, returns a code reference */
2097/* the arg can be accessed via GENSUB_ARG from the callback */
2098/* the callback must use dXSARGS/XSRETURN */
2099static SV *
2100gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2101{ 2646{
2102 CV *cv = (CV *)newSV (0); 2647 if (items >= 2)
2648 {
2649 /* callback form */
2650 AV *av = (AV *)SvRV (arg [0]);
2651 SV *cb_cv = s_get_cv_croak (arg [1]);
2103 2652
2104 sv_upgrade ((SV *)cv, SVt_PVCV); 2653 av_push (av, SvREFCNT_inc_NN (cb_cv));
2105 2654
2106 CvANON_on (cv); 2655 if (SvIVX (AvARRAY (av)[0]) > 0)
2107 CvISXSUB_on (cv); 2656 coro_semaphore_adjust (aTHX_ av, 0);
2108 CvXSUB (cv) = xsub;
2109 GENSUB_ARG = arg;
2110 2657
2111 return newRV_noinc ((SV *)cv); 2658 frame->prepare = prepare_nop;
2659 frame->check = slf_check_nop;
2660 }
2661 else
2662 {
2663 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2664 frame->check = slf_check_semaphore_wait;
2665 }
2666}
2667
2668/* signal */
2669
2670static void
2671coro_signal_wake (pTHX_ AV *av, int count)
2672{
2673 SvIVX (AvARRAY (av)[0]) = 0;
2674
2675 /* now signal count waiters */
2676 while (count > 0 && AvFILLp (av) > 0)
2677 {
2678 SV *cb;
2679
2680 /* swap first two elements so we can shift a waiter */
2681 cb = AvARRAY (av)[0];
2682 AvARRAY (av)[0] = AvARRAY (av)[1];
2683 AvARRAY (av)[1] = cb;
2684
2685 cb = av_shift (av);
2686
2687 if (SvTYPE (cb) == SVt_PVCV)
2688 {
2689 dSP;
2690 PUSHMARK (SP);
2691 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2692 PUTBACK;
2693 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2694 }
2695 else
2696 {
2697 api_ready (aTHX_ cb);
2698 sv_setiv (cb, 0); /* signal waiter */
2699 }
2700
2701 SvREFCNT_dec (cb);
2702
2703 --count;
2704 }
2705}
2706
2707static int
2708slf_check_signal_wait (pTHX_ struct CoroSLF *frame)
2709{
2710 /* if we are about to throw, also stop waiting */
2711 return SvROK ((SV *)frame->data) && !CORO_THROW;
2712}
2713
2714static void
2715slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2716{
2717 AV *av = (AV *)SvRV (arg [0]);
2718
2719 if (items >= 2)
2720 {
2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2722 av_push (av, SvREFCNT_inc_NN (cb_cv));
2723
2724 if (SvIVX (AvARRAY (av)[0]))
2725 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2726
2727 frame->prepare = prepare_nop;
2728 frame->check = slf_check_nop;
2729 }
2730 else if (SvIVX (AvARRAY (av)[0]))
2731 {
2732 SvIVX (AvARRAY (av)[0]) = 0;
2733 frame->prepare = prepare_nop;
2734 frame->check = slf_check_nop;
2735 }
2736 else
2737 {
2738 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2739
2740 av_push (av, waiter);
2741
2742 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2743 frame->prepare = prepare_schedule;
2744 frame->check = slf_check_signal_wait;
2745 }
2112} 2746}
2113 2747
2114/*****************************************************************************/ 2748/*****************************************************************************/
2115/* Coro::AIO */ 2749/* Coro::AIO */
2116 2750
… …
2127 2761
2128static void 2762static void
2129coro_aio_callback (pTHX_ CV *cv) 2763coro_aio_callback (pTHX_ CV *cv)
2130{ 2764{
2131 dXSARGS; 2765 dXSARGS;
2132 AV *state = (AV *)GENSUB_ARG; 2766 AV *state = (AV *)S_GENSUB_ARG;
2133 SV *coro = av_pop (state); 2767 SV *coro = av_pop (state);
2134 SV *data_sv = newSV (sizeof (struct io_state)); 2768 SV *data_sv = newSV (sizeof (struct io_state));
2135 2769
2136 av_extend (state, items); 2770 av_extend (state, items - 1);
2137 2771
2138 sv_upgrade (data_sv, SVt_PV); 2772 sv_upgrade (data_sv, SVt_PV);
2139 SvCUR_set (data_sv, sizeof (struct io_state)); 2773 SvCUR_set (data_sv, sizeof (struct io_state));
2140 SvPOK_only (data_sv); 2774 SvPOK_only (data_sv);
2141 2775
… …
2166static int 2800static int
2167slf_check_aio_req (pTHX_ struct CoroSLF *frame) 2801slf_check_aio_req (pTHX_ struct CoroSLF *frame)
2168{ 2802{
2169 AV *state = (AV *)frame->data; 2803 AV *state = (AV *)frame->data;
2170 2804
2805 /* if we are about to throw, return early */
2806 /* this does not cancel the aio request, but at least */
2807 /* it quickly returns */
2808 if (CORO_THROW)
2809 return 0;
2810
2171 /* one element that is an RV? repeat! */ 2811 /* one element that is an RV? repeat! */
2172 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0])) 2812 if (AvFILLp (state) == 0 && SvROK (AvARRAY (state)[0]))
2173 return 1; 2813 return 1;
2174 2814
2175 /* restore status */ 2815 /* restore status */
… …
2245 2885
2246 for (i = 0; i < items; ++i) 2886 for (i = 0; i < items; ++i)
2247 PUSHs (arg [i]); 2887 PUSHs (arg [i]);
2248 2888
2249 /* now push the callback closure */ 2889 /* now push the callback closure */
2250 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2890 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2251 2891
2252 /* now call the AIO function - we assume our request is uncancelable */ 2892 /* now call the AIO function - we assume our request is uncancelable */
2253 PUTBACK; 2893 PUTBACK;
2254 call_sv ((SV *)req, G_VOID | G_DISCARD); 2894 call_sv ((SV *)req, G_VOID | G_DISCARD);
2255 } 2895 }
… …
2269 2909
2270 XSRETURN_EMPTY; 2910 XSRETURN_EMPTY;
2271} 2911}
2272 2912
2273/*****************************************************************************/ 2913/*****************************************************************************/
2914
2915#if CORO_CLONE
2916# include "clone.c"
2917#endif
2918
2919/*****************************************************************************/
2920
2921static SV *
2922coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2923{
2924 SV *coro_sv;
2925 struct coro *coro;
2926 MAGIC *mg;
2927 HV *hv;
2928 SV *cb;
2929 int i;
2930
2931 if (argc > 0)
2932 {
2933 cb = s_get_cv_croak (argv [0]);
2934
2935 if (!is_coro)
2936 {
2937 if (CvISXSUB (cb))
2938 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2939
2940 if (!CvROOT (cb))
2941 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2942 }
2943 }
2944
2945 Newz (0, coro, 1, struct coro);
2946 coro->args = newAV ();
2947 coro->flags = CF_NEW;
2948
2949 if (coro_first) coro_first->prev = coro;
2950 coro->next = coro_first;
2951 coro_first = coro;
2952
2953 coro->hv = hv = newHV ();
2954 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2955 mg->mg_flags |= MGf_DUP;
2956 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2957
2958 if (argc > 0)
2959 {
2960 av_extend (coro->args, argc + is_coro - 1);
2961
2962 if (is_coro)
2963 {
2964 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2965 cb = (SV *)cv_coro_run;
2966 }
2967
2968 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2969
2970 for (i = 1; i < argc; i++)
2971 av_push (coro->args, newSVsv (argv [i]));
2972 }
2973
2974 return coro_sv;
2975}
2274 2976
2275MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2977MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2276 2978
2277PROTOTYPES: DISABLE 2979PROTOTYPES: DISABLE
2278 2980
… …
2283 coro_thx = PERL_GET_CONTEXT; 2985 coro_thx = PERL_GET_CONTEXT;
2284# endif 2986# endif
2285#endif 2987#endif
2286 BOOT_PAGESIZE; 2988 BOOT_PAGESIZE;
2287 2989
2990 cctx_current = cctx_new_empty ();
2991
2288 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2992 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2289 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2993 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2290 2994
2291 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2995 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2292 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2996 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2311 3015
2312 { 3016 {
2313 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3017 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2314 3018
2315 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3019 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2316 hv_store_ent (PL_custom_op_names, slf, 3020 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2317 newSVpv ("coro_slf", 0), 0);
2318 3021
2319 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3022 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2320 hv_store_ent (PL_custom_op_descs, slf, 3023 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2321 newSVpv ("coro schedule like function", 0), 0);
2322 } 3024 }
2323 3025
2324 coroapi.ver = CORO_API_VERSION; 3026 coroapi.ver = CORO_API_VERSION;
2325 coroapi.rev = CORO_API_REVISION; 3027 coroapi.rev = CORO_API_REVISION;
2326 3028
… …
2338 3040
2339 if (!svp) croak ("Time::HiRes is required"); 3041 if (!svp) croak ("Time::HiRes is required");
2340 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3042 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2341 3043
2342 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3044 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3045
3046 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3047 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2343 } 3048 }
2344 3049
2345 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3050 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2346} 3051}
2347 3052
2348SV * 3053SV *
2349new (char *klass, ...) 3054new (SV *klass, ...)
3055 ALIAS:
3056 Coro::new = 1
2350 CODE: 3057 CODE:
2351{ 3058 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2352 struct coro *coro; 3059 OUTPUT:
2353 MAGIC *mg;
2354 HV *hv;
2355 int i;
2356
2357 Newz (0, coro, 1, struct coro);
2358 coro->args = newAV ();
2359 coro->flags = CF_NEW;
2360
2361 if (coro_first) coro_first->prev = coro;
2362 coro->next = coro_first;
2363 coro_first = coro;
2364
2365 coro->hv = hv = newHV ();
2366 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2367 mg->mg_flags |= MGf_DUP;
2368 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2369
2370 av_extend (coro->args, items - 1);
2371 for (i = 1; i < items; i++)
2372 av_push (coro->args, newSVsv (ST (i)));
2373}
2374 OUTPUT:
2375 RETVAL 3060 RETVAL
2376 3061
2377void 3062void
2378transfer (...) 3063transfer (...)
2379 PROTOTYPE: $$ 3064 PROTOTYPE: $$
… …
2390void 3075void
2391_exit (int code) 3076_exit (int code)
2392 PROTOTYPE: $ 3077 PROTOTYPE: $
2393 CODE: 3078 CODE:
2394 _exit (code); 3079 _exit (code);
3080
3081SV *
3082clone (Coro::State coro)
3083 CODE:
3084{
3085#if CORO_CLONE
3086 struct coro *ncoro = coro_clone (aTHX_ coro);
3087 MAGIC *mg;
3088 /* TODO: too much duplication */
3089 ncoro->hv = newHV ();
3090 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3091 mg->mg_flags |= MGf_DUP;
3092 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3093#else
3094 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3095#endif
3096}
3097 OUTPUT:
3098 RETVAL
2395 3099
2396int 3100int
2397cctx_stacksize (int new_stacksize = 0) 3101cctx_stacksize (int new_stacksize = 0)
2398 PROTOTYPE: ;$ 3102 PROTOTYPE: ;$
2399 CODE: 3103 CODE:
… …
2449 eval = 1 3153 eval = 1
2450 CODE: 3154 CODE:
2451{ 3155{
2452 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3156 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2453 { 3157 {
2454 struct coro temp; 3158 struct coro *current = SvSTATE_current;
2455 3159
2456 if (!(coro->flags & CF_RUNNING)) 3160 if (current != coro)
2457 { 3161 {
2458 PUTBACK; 3162 PUTBACK;
2459 save_perl (aTHX_ &temp); 3163 save_perl (aTHX_ current);
2460 load_perl (aTHX_ coro); 3164 load_perl (aTHX_ coro);
3165 SPAGAIN;
2461 } 3166 }
2462 3167
2463 {
2464 dSP;
2465 ENTER;
2466 SAVETMPS;
2467 PUTBACK;
2468 PUSHSTACK; 3168 PUSHSTACK;
3169
2469 PUSHMARK (SP); 3170 PUSHMARK (SP);
3171 PUTBACK;
2470 3172
2471 if (ix) 3173 if (ix)
2472 eval_sv (coderef, 0); 3174 eval_sv (coderef, 0);
2473 else 3175 else
2474 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3176 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2475 3177
2476 POPSTACK; 3178 POPSTACK;
2477 SPAGAIN; 3179 SPAGAIN;
2478 FREETMPS;
2479 LEAVE;
2480 PUTBACK;
2481 }
2482 3180
2483 if (!(coro->flags & CF_RUNNING)) 3181 if (current != coro)
2484 { 3182 {
3183 PUTBACK;
2485 save_perl (aTHX_ coro); 3184 save_perl (aTHX_ coro);
2486 load_perl (aTHX_ &temp); 3185 load_perl (aTHX_ current);
2487 SPAGAIN; 3186 SPAGAIN;
2488 } 3187 }
2489 } 3188 }
2490} 3189}
2491 3190
… …
2495 ALIAS: 3194 ALIAS:
2496 is_ready = CF_READY 3195 is_ready = CF_READY
2497 is_running = CF_RUNNING 3196 is_running = CF_RUNNING
2498 is_new = CF_NEW 3197 is_new = CF_NEW
2499 is_destroyed = CF_DESTROYED 3198 is_destroyed = CF_DESTROYED
3199 is_suspended = CF_SUSPENDED
2500 CODE: 3200 CODE:
2501 RETVAL = boolSV (coro->flags & ix); 3201 RETVAL = boolSV (coro->flags & ix);
2502 OUTPUT: 3202 OUTPUT:
2503 RETVAL 3203 RETVAL
2504 3204
… …
2506throw (Coro::State self, SV *throw = &PL_sv_undef) 3206throw (Coro::State self, SV *throw = &PL_sv_undef)
2507 PROTOTYPE: $;$ 3207 PROTOTYPE: $;$
2508 CODE: 3208 CODE:
2509{ 3209{
2510 struct coro *current = SvSTATE_current; 3210 struct coro *current = SvSTATE_current;
2511 SV **throwp = self == current ? &coro_throw : &self->throw; 3211 SV **throwp = self == current ? &CORO_THROW : &self->except;
2512 SvREFCNT_dec (*throwp); 3212 SvREFCNT_dec (*throwp);
3213 SvGETMAGIC (throw);
2513 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3214 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2514} 3215}
2515 3216
2516void 3217void
2517api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3218api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2520 3221
2521SV * 3222SV *
2522has_cctx (Coro::State coro) 3223has_cctx (Coro::State coro)
2523 PROTOTYPE: $ 3224 PROTOTYPE: $
2524 CODE: 3225 CODE:
2525 RETVAL = boolSV (!!coro->cctx); 3226 /* maybe manage the running flag differently */
3227 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2526 OUTPUT: 3228 OUTPUT:
2527 RETVAL 3229 RETVAL
2528 3230
2529int 3231int
2530is_traced (Coro::State coro) 3232is_traced (Coro::State coro)
… …
2550 3252
2551void 3253void
2552force_cctx () 3254force_cctx ()
2553 PROTOTYPE: 3255 PROTOTYPE:
2554 CODE: 3256 CODE:
2555 SvSTATE_current->cctx->idle_sp = 0; 3257 cctx_current->idle_sp = 0;
2556 3258
2557void 3259void
2558swap_defsv (Coro::State self) 3260swap_defsv (Coro::State self)
2559 PROTOTYPE: $ 3261 PROTOTYPE: $
2560 ALIAS: 3262 ALIAS:
… …
2568 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3270 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2569 3271
2570 SV *tmp = *src; *src = *dst; *dst = tmp; 3272 SV *tmp = *src; *src = *dst; *dst = tmp;
2571 } 3273 }
2572 3274
3275void
3276cancel (Coro::State self)
3277 CODE:
3278 coro_state_destroy (aTHX_ self);
3279 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3280
3281
3282SV *
3283enable_times (int enabled = enable_times)
3284 CODE:
3285{
3286 RETVAL = boolSV (enable_times);
3287
3288 if (enabled != enable_times)
3289 {
3290 enable_times = enabled;
3291
3292 coro_times_update ();
3293 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3294 }
3295}
3296 OUTPUT:
3297 RETVAL
3298
3299void
3300times (Coro::State self)
3301 PPCODE:
3302{
3303 struct coro *current = SvSTATE (coro_current);
3304
3305 if (expect_false (current == self))
3306 {
3307 coro_times_update ();
3308 coro_times_add (SvSTATE (coro_current));
3309 }
3310
3311 EXTEND (SP, 2);
3312 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3313 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3314
3315 if (expect_false (current == self))
3316 coro_times_sub (SvSTATE (coro_current));
3317}
2573 3318
2574MODULE = Coro::State PACKAGE = Coro 3319MODULE = Coro::State PACKAGE = Coro
2575 3320
2576BOOT: 3321BOOT:
2577{ 3322{
2578 int i;
2579
2580 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2581 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3323 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2582 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3324 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2583 3325 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3326 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2584 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3327 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2585 SvREADONLY_on (coro_current); 3328 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3329 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3330 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3331 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3332
3333 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3334 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3335 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2586 3336
2587 coro_stash = gv_stashpv ("Coro", TRUE); 3337 coro_stash = gv_stashpv ("Coro", TRUE);
2588 3338
2589 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3339 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2590 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3340 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2591 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3341 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2592 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3342 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2593 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3343 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2594 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3344 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2595
2596 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2597 coro_ready[i] = newAV ();
2598 3345
2599 { 3346 {
2600 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3347 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2601 3348
2602 coroapi.schedule = api_schedule; 3349 coroapi.schedule = api_schedule;
3350 coroapi.schedule_to = api_schedule_to;
2603 coroapi.cede = api_cede; 3351 coroapi.cede = api_cede;
2604 coroapi.cede_notself = api_cede_notself; 3352 coroapi.cede_notself = api_cede_notself;
2605 coroapi.ready = api_ready; 3353 coroapi.ready = api_ready;
2606 coroapi.is_ready = api_is_ready; 3354 coroapi.is_ready = api_is_ready;
2607 coroapi.nready = coro_nready; 3355 coroapi.nready = coro_nready;
2608 coroapi.current = coro_current; 3356 coroapi.current = coro_current;
2609 3357
2610 GCoroAPI = &coroapi; 3358 /*GCoroAPI = &coroapi;*/
2611 sv_setiv (sv, (IV)&coroapi); 3359 sv_setiv (sv, (IV)&coroapi);
2612 SvREADONLY_on (sv); 3360 SvREADONLY_on (sv);
2613 } 3361 }
2614} 3362}
3363
3364SV *
3365async (...)
3366 PROTOTYPE: &@
3367 CODE:
3368 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3369 api_ready (RETVAL);
3370 OUTPUT:
3371 RETVAL
3372
3373void
3374terminate (...)
3375 CODE:
3376 CORO_EXECUTE_SLF_XS (slf_init_terminate);
2615 3377
2616void 3378void
2617schedule (...) 3379schedule (...)
2618 CODE: 3380 CODE:
2619 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3381 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3382
3383void
3384schedule_to (...)
3385 CODE:
3386 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3387
3388void
3389cede_to (...)
3390 CODE:
3391 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2620 3392
2621void 3393void
2622cede (...) 3394cede (...)
2623 CODE: 3395 CODE:
2624 CORO_EXECUTE_SLF_XS (slf_init_cede); 3396 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2638void 3410void
2639_set_readyhook (SV *hook) 3411_set_readyhook (SV *hook)
2640 PROTOTYPE: $ 3412 PROTOTYPE: $
2641 CODE: 3413 CODE:
2642 SvREFCNT_dec (coro_readyhook); 3414 SvREFCNT_dec (coro_readyhook);
3415 SvGETMAGIC (hook);
3416 if (SvOK (hook))
3417 {
2643 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3418 coro_readyhook = newSVsv (hook);
3419 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3420 }
3421 else
3422 {
3423 coro_readyhook = 0;
3424 CORO_READYHOOK = 0;
3425 }
2644 3426
2645int 3427int
2646prio (Coro::State coro, int newprio = 0) 3428prio (Coro::State coro, int newprio = 0)
2647 PROTOTYPE: $;$ 3429 PROTOTYPE: $;$
2648 ALIAS: 3430 ALIAS:
… …
2654 if (items > 1) 3436 if (items > 1)
2655 { 3437 {
2656 if (ix) 3438 if (ix)
2657 newprio = coro->prio - newprio; 3439 newprio = coro->prio - newprio;
2658 3440
2659 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3441 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2660 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3442 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2661 3443
2662 coro->prio = newprio; 3444 coro->prio = newprio;
2663 } 3445 }
2664} 3446}
2665 OUTPUT: 3447 OUTPUT:
… …
2679 CODE: 3461 CODE:
2680 RETVAL = coro_nready; 3462 RETVAL = coro_nready;
2681 OUTPUT: 3463 OUTPUT:
2682 RETVAL 3464 RETVAL
2683 3465
2684# for async_pool speedup
2685void 3466void
2686_pool_1 (SV *cb) 3467suspend (Coro::State self)
3468 PROTOTYPE: $
2687 CODE: 3469 CODE:
2688{ 3470 self->flags |= CF_SUSPENDED;
2689 HV *hv = (HV *)SvRV (coro_current);
2690 struct coro *coro = SvSTATE_hv ((SV *)hv);
2691 AV *defav = GvAV (PL_defgv);
2692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2693 AV *invoke_av;
2694 int i, len;
2695 3471
2696 if (!invoke) 3472void
3473resume (Coro::State self)
3474 PROTOTYPE: $
3475 CODE:
3476 self->flags &= ~CF_SUSPENDED;
3477
3478void
3479_pool_handler (...)
3480 CODE:
3481 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3482
3483void
3484async_pool (SV *cv, ...)
3485 PROTOTYPE: &@
3486 PPCODE:
3487{
3488 HV *hv = (HV *)av_pop (av_async_pool);
3489 AV *av = newAV ();
3490 SV *cb = ST (0);
3491 int i;
3492
3493 av_extend (av, items - 2);
3494 for (i = 1; i < items; ++i)
3495 av_push (av, SvREFCNT_inc_NN (ST (i)));
3496
3497 if ((SV *)hv == &PL_sv_undef)
2697 { 3498 {
2698 SV *old = PL_diehook; 3499 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2699 PL_diehook = 0; 3500 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2700 SvREFCNT_dec (old); 3501 SvREFCNT_dec (sv);
2701 croak ("\3async_pool terminate\2\n");
2702 } 3502 }
2703 3503
2704 SvREFCNT_dec (coro->saved_deffh);
2705 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2706
2707 hv_store (hv, "desc", sizeof ("desc") - 1,
2708 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2709
2710 invoke_av = (AV *)SvRV (invoke);
2711 len = av_len (invoke_av);
2712
2713 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2714
2715 if (len > 0)
2716 { 3504 {
2717 av_fill (defav, len - 1); 3505 struct coro *coro = SvSTATE_hv (hv);
2718 for (i = 0; i < len; ++i) 3506
2719 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3507 assert (!coro->invoke_cb);
3508 assert (!coro->invoke_av);
3509 coro->invoke_cb = SvREFCNT_inc (cb);
3510 coro->invoke_av = av;
2720 } 3511 }
3512
3513 api_ready (aTHX_ (SV *)hv);
3514
3515 if (GIMME_V != G_VOID)
3516 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
3517 else
3518 SvREFCNT_dec (hv);
2721} 3519}
3520
3521SV *
3522rouse_cb ()
3523 PROTOTYPE:
3524 CODE:
3525 RETVAL = coro_new_rouse_cb (aTHX);
3526 OUTPUT:
3527 RETVAL
2722 3528
2723void 3529void
2724_pool_2 (SV *cb) 3530rouse_wait (...)
3531 PROTOTYPE: ;$
3532 PPCODE:
3533 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3534
3535void
3536on_enter (SV *block)
3537 ALIAS:
3538 on_leave = 1
3539 PROTOTYPE: &
2725 CODE: 3540 CODE:
2726{ 3541{
2727 HV *hv = (HV *)SvRV (coro_current);
2728 struct coro *coro = SvSTATE_hv ((SV *)hv); 3542 struct coro *coro = SvSTATE_current;
3543 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
2729 3544
2730 sv_setsv (cb, &PL_sv_undef); 3545 block = s_get_cv_croak (block);
2731 3546
2732 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3547 if (!*avp)
2733 coro->saved_deffh = 0; 3548 *avp = newAV ();
2734 3549
2735 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 3550 av_push (*avp, SvREFCNT_inc (block));
2736 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2737 {
2738 SV *old = PL_diehook;
2739 PL_diehook = 0;
2740 SvREFCNT_dec (old);
2741 croak ("\3async_pool terminate\2\n");
2742 }
2743 3551
2744 av_clear (GvAV (PL_defgv)); 3552 if (!ix)
2745 hv_store (hv, "desc", sizeof ("desc") - 1, 3553 on_enterleave_call (aTHX_ block);
2746 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2747 3554
2748 coro->prio = 0; 3555 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2749 3556 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
2750 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 3557 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
2751 api_trace (aTHX_ coro_current, 0);
2752
2753 av_push (av_async_pool, newSVsv (coro_current));
2754} 3558}
2755 3559
2756 3560
2757MODULE = Coro::State PACKAGE = PerlIO::cede 3561MODULE = Coro::State PACKAGE = PerlIO::cede
2758 3562
… …
2761 3565
2762 3566
2763MODULE = Coro::State PACKAGE = Coro::Semaphore 3567MODULE = Coro::State PACKAGE = Coro::Semaphore
2764 3568
2765SV * 3569SV *
2766new (SV *klass, SV *count_ = 0) 3570new (SV *klass, SV *count = 0)
2767 CODE: 3571 CODE:
2768{ 3572{
2769 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 3573 int semcnt = 1;
2770 AV *av = newAV ();
2771 SV **ary;
2772 3574
2773 /* unfortunately, building manually saves memory */ 3575 if (count)
2774 Newx (ary, 2, SV *); 3576 {
2775 AvALLOC (av) = ary; 3577 SvGETMAGIC (count);
2776 AvARRAY (av) = ary;
2777 AvMAX (av) = 1;
2778 AvFILLp (av) = 0;
2779 ary [0] = newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1);
2780 3578
2781 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv))); 3579 if (SvOK (count))
3580 semcnt = SvIV (count);
3581 }
3582
3583 RETVAL = sv_bless (
3584 coro_waitarray_new (aTHX_ semcnt),
3585 GvSTASH (CvGV (cv))
3586 );
2782} 3587}
3588 OUTPUT:
3589 RETVAL
3590
3591# helper for Coro::Channel and others
3592SV *
3593_alloc (int count)
3594 CODE:
3595 RETVAL = coro_waitarray_new (aTHX_ count);
2783 OUTPUT: 3596 OUTPUT:
2784 RETVAL 3597 RETVAL
2785 3598
2786SV * 3599SV *
2787count (SV *self) 3600count (SV *self)
… …
2796 adjust = 1 3609 adjust = 1
2797 CODE: 3610 CODE:
2798 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3611 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
2799 3612
2800void 3613void
2801down (SV *self) 3614down (...)
2802 CODE: 3615 CODE:
2803 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3616 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3617
3618void
3619wait (...)
3620 CODE:
3621 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
2804 3622
2805void 3623void
2806try (SV *self) 3624try (SV *self)
2807 PPCODE: 3625 PPCODE:
2808{ 3626{
… …
2820 XSRETURN_NO; 3638 XSRETURN_NO;
2821} 3639}
2822 3640
2823void 3641void
2824waiters (SV *self) 3642waiters (SV *self)
2825 CODE: 3643 PPCODE:
2826{ 3644{
2827 AV *av = (AV *)SvRV (self); 3645 AV *av = (AV *)SvRV (self);
3646 int wcount = AvFILLp (av) + 1 - 1;
2828 3647
2829 if (GIMME_V == G_SCALAR) 3648 if (GIMME_V == G_SCALAR)
2830 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0]))); 3649 XPUSHs (sv_2mortal (newSViv (wcount)));
2831 else 3650 else
2832 { 3651 {
2833 int i; 3652 int i;
2834 EXTEND (SP, AvFILLp (av) + 1 - 1); 3653 EXTEND (SP, wcount);
2835 for (i = 1; i <= AvFILLp (av); ++i) 3654 for (i = 1; i <= wcount; ++i)
2836 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3655 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
2837 } 3656 }
2838} 3657}
3658
3659MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3660
3661void
3662_may_delete (SV *sem, int count, int extra_refs)
3663 PPCODE:
3664{
3665 AV *av = (AV *)SvRV (sem);
3666
3667 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3668 && AvFILLp (av) == 0 /* no waiters, just count */
3669 && SvIV (AvARRAY (av)[0]) == count)
3670 XSRETURN_YES;
3671
3672 XSRETURN_NO;
3673}
3674
3675MODULE = Coro::State PACKAGE = Coro::Signal
3676
3677SV *
3678new (SV *klass)
3679 CODE:
3680 RETVAL = sv_bless (
3681 coro_waitarray_new (aTHX_ 0),
3682 GvSTASH (CvGV (cv))
3683 );
3684 OUTPUT:
3685 RETVAL
3686
3687void
3688wait (...)
3689 CODE:
3690 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3691
3692void
3693broadcast (SV *self)
3694 CODE:
3695{
3696 AV *av = (AV *)SvRV (self);
3697 coro_signal_wake (aTHX_ av, AvFILLp (av));
3698}
3699
3700void
3701send (SV *self)
3702 CODE:
3703{
3704 AV *av = (AV *)SvRV (self);
3705
3706 if (AvFILLp (av))
3707 coro_signal_wake (aTHX_ av, 1);
3708 else
3709 SvIVX (AvARRAY (av)[0]) = 1; /* remember the signal */
3710}
3711
3712IV
3713awaited (SV *self)
3714 CODE:
3715 RETVAL = AvFILLp ((AV *)SvRV (self)) + 1 - 1;
3716 OUTPUT:
3717 RETVAL
2839 3718
2840 3719
2841MODULE = Coro::State PACKAGE = Coro::AnyEvent 3720MODULE = Coro::State PACKAGE = Coro::AnyEvent
2842 3721
2843BOOT: 3722BOOT:
… …
2871 3750
2872void 3751void
2873_register (char *target, char *proto, SV *req) 3752_register (char *target, char *proto, SV *req)
2874 CODE: 3753 CODE:
2875{ 3754{
2876 HV *st; 3755 SV *req_cv = s_get_cv_croak (req);
2877 GV *gvp;
2878 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
2879 /* newXSproto doesn't return the CV on 5.8 */ 3756 /* newXSproto doesn't return the CV on 5.8 */
2880 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3757 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
2881 sv_setpv ((SV *)slf_cv, proto); 3758 sv_setpv ((SV *)slf_cv, proto);
2882 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3759 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
2883} 3760}
2884 3761
3762MODULE = Coro::State PACKAGE = Coro::Select
3763
3764void
3765patch_pp_sselect ()
3766 CODE:
3767 if (!coro_old_pp_sselect)
3768 {
3769 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3770 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3771 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3772 }
3773
3774void
3775unpatch_pp_sselect ()
3776 CODE:
3777 if (coro_old_pp_sselect)
3778 {
3779 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3780 coro_old_pp_sselect = 0;
3781 }
3782
3783

Diff Legend

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