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.305 by root, Wed Nov 19 10:44:41 2008 UTC vs.
Revision 1.376 by root, Fri Oct 2 20:48:04 2009 UTC

1#define NDEBUG 1
2
1#include "libcoro/coro.c" 3#include "libcoro/coro.c"
2 4
3#define PERL_NO_GET_CONTEXT 5#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 6#define PERL_EXT
5 7
6#include "EXTERN.h" 8#include "EXTERN.h"
7#include "perl.h" 9#include "perl.h"
8#include "XSUB.h" 10#include "XSUB.h"
9#include "perliol.h" 11#include "perliol.h"
10 12
11#include "patchlevel.h" 13#include "schmorp.h"
12 14
13#include <stdio.h> 15#include <stdio.h>
14#include <errno.h> 16#include <errno.h>
15#include <assert.h> 17#include <assert.h>
18
19#ifndef SVs_PADSTALE
20# define SVs_PADSTALE 0
21#endif
16 22
17#ifdef WIN32 23#ifdef WIN32
18# undef setjmp 24# undef setjmp
19# undef longjmp 25# undef longjmp
20# undef _exit 26# undef _exit
… …
51#endif 57#endif
52 58
53/* the maximum number of idle cctx that will be pooled */ 59/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 60static int cctx_max_idle = 4;
55 61
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 62#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 63# undef CORO_STACKGUARD
111#endif 64#endif
112 65
113#ifndef CORO_STACKGUARD 66#ifndef CORO_STACKGUARD
… …
127#else 80#else
128# define dSTACKLEVEL volatile void *stacklevel 81# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 82# define STACKLEVEL ((void *)&stacklevel)
130#endif 83#endif
131 84
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 85#define IN_DESTRUCT PL_dirty
133 86
134#if __GNUC__ >= 3 87#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 88# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 89# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 90# define INLINE static inline
138#else 91#else
139# define attribute(x) 92# define attribute(x)
140# define expect(expr,value) (expr) 93# define expect(expr,value) (expr)
141# define INLINE static 94# define INLINE static
… …
153# if CORO_PTHREAD 106# if CORO_PTHREAD
154static void *coro_thx; 107static void *coro_thx;
155# endif 108# endif
156#endif 109#endif
157 110
111#ifdef __linux
112# include <time.h> /* for timespec */
113# include <syscall.h> /* for SYS_* */
114# ifdef SYS_clock_gettime
115# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
116# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif
119#endif
120
158static double (*nvtime)(); /* so why doesn't it take void? */ 121static double (*nvtime)(); /* so why doesn't it take void? */
122static void (*u2time)(pTHX_ UV ret[2]);
159 123
160/* we hijack an hopefully unused CV flag for our purposes */ 124/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 125#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 126static OP *pp_slf (pTHX);
163 127
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 131static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 132static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 133static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 134static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 135
136static AV *av_destroy; /* destruction queue */
137static SV *sv_manager; /* the manager coro */
138static SV *sv_idle; /* $Coro::idle */
139
172static GV *irsgv; /* $/ */ 140static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 141static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 142static SV *rv_diehook;
175static SV *rv_warnhook; 143static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 144static HV *hv_sig; /* %SIG */
177 145
178/* async_pool helper stuff */ 146/* async_pool helper stuff */
179static SV *sv_pool_rss; 147static SV *sv_pool_rss;
180static SV *sv_pool_size; 148static SV *sv_pool_size;
149static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 150static AV *av_async_pool; /* idle pool */
151static SV *sv_Coro; /* class string */
152static CV *cv_pool_handler;
182 153
183/* Coro::AnyEvent */ 154/* Coro::AnyEvent */
184static SV *sv_activity; 155static SV *sv_activity;
156
157/* enable processtime/realtime profiling */
158static char enable_times;
159typedef U32 coro_ts[2];
160static coro_ts time_real, time_cpu;
161static char times_valid;
185 162
186static struct coro_cctx *cctx_first; 163static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 164static int cctx_count, cctx_idle;
188 165
189enum { 166enum {
… …
215 int valgrind_id; 192 int valgrind_id;
216#endif 193#endif
217 unsigned char flags; 194 unsigned char flags;
218} coro_cctx; 195} coro_cctx;
219 196
197coro_cctx *cctx_current; /* the currently running cctx */
198
199/*****************************************************************************/
200
220enum { 201enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 202 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 203 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 204 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 205 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
206 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 207};
226 208
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 209/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 210typedef struct
229{ 211{
230 SV *defsv; 212 SV *defsv;
231 AV *defav; 213 AV *defav;
232 SV *errsv; 214 SV *errsv;
233 SV *irsgv; 215 SV *irsgv;
216 HV *hinthv;
234#define VAR(name,type) type name; 217#define VAR(name,type) type name;
235# include "state.h" 218# include "state.h"
236#undef VAR 219#undef VAR
237} perl_slots; 220} perl_slots;
238 221
… …
241/* this is a structure representing a perl-level coroutine */ 224/* this is a structure representing a perl-level coroutine */
242struct coro { 225struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 226 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 227 coro_cctx *cctx;
245 228
229 /* ready queue */
230 struct coro *next_ready;
231
246 /* state data */ 232 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 233 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 234 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 235 perl_slots *slot; /* basically the saved sp */
250 236
237 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 238 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 239 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 240 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 241 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 242 void (*on_destroy)(pTHX_ struct coro *coro);
256 243
257 /* statistics */ 244 /* statistics */
258 int usecount; /* number of transfers to this coro */ 245 int usecount; /* number of transfers to this coro */
259 246
… …
262 SV *except; /* exception to be thrown */ 249 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 250 SV *rouse_cb;
264 251
265 /* async_pool */ 252 /* async_pool */
266 SV *saved_deffh; 253 SV *saved_deffh;
254 SV *invoke_cb;
255 AV *invoke_av;
256
257 /* on_enter/on_leave */
258 AV *on_enter;
259 AV *on_leave;
260
261 /* swap_sv */
262 AV *swap_sv;
263
264 /* times */
265 coro_ts t_cpu, t_real;
267 266
268 /* linked list */ 267 /* linked list */
269 struct coro *next, *prev; 268 struct coro *next, *prev;
270}; 269};
271 270
… …
277/* the mainr easonw e don't support windows process emulation */ 276/* the mainr easonw e don't support windows process emulation */
278static struct CoroSLF slf_frame; /* the current slf frame */ 277static struct CoroSLF slf_frame; /* the current slf frame */
279 278
280/** Coro ********************************************************************/ 279/** Coro ********************************************************************/
281 280
282#define PRIO_MAX 3 281#define CORO_PRIO_MAX 3
283#define PRIO_HIGH 1 282#define CORO_PRIO_HIGH 1
284#define PRIO_NORMAL 0 283#define CORO_PRIO_NORMAL 0
285#define PRIO_LOW -1 284#define CORO_PRIO_LOW -1
286#define PRIO_IDLE -3 285#define CORO_PRIO_IDLE -3
287#define PRIO_MIN -4 286#define CORO_PRIO_MIN -4
288 287
289/* for Coro.pm */ 288/* for Coro.pm */
290static SV *coro_current; 289static SV *coro_current;
291static SV *coro_readyhook; 290static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 291static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
292static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 293static struct coro *coro_first;
294#define coro_nready coroapi.nready 294#define coro_nready coroapi.nready
295
296/** Coro::Select ************************************************************/
297
298static OP *(*coro_old_pp_sselect) (pTHX);
299static SV *coro_select_select;
300
301/* horrible hack, but if it works... */
302static OP *
303coro_pp_sselect (pTHX)
304{
305 dSP;
306 PUSHMARK (SP - 4); /* fake argument list */
307 XPUSHs (coro_select_select);
308 PUTBACK;
309
310 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
311 PL_op->op_flags |= OPf_STACKED;
312 PL_op->op_private = 0;
313 return PL_ppaddr [OP_ENTERSUB](aTHX);
314}
295 315
296/** lowlevel stuff **********************************************************/ 316/** lowlevel stuff **********************************************************/
297 317
298static SV * 318static SV *
299coro_get_sv (pTHX_ const char *name, int create) 319coro_get_sv (pTHX_ const char *name, int create)
… …
323 get_hv (name, create); 343 get_hv (name, create);
324#endif 344#endif
325 return get_hv (name, create); 345 return get_hv (name, create);
326} 346}
327 347
348INLINE void
349coro_times_update ()
350{
351#ifdef coro_clock_gettime
352 struct timespec ts;
353
354 ts.tv_sec = ts.tv_nsec = 0;
355 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
356 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
357
358 ts.tv_sec = ts.tv_nsec = 0;
359 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
360 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
361#else
362 dTHX;
363 UV tv[2];
364
365 u2time (aTHX_ tv);
366 time_real [0] = tv [0];
367 time_real [1] = tv [1] * 1000;
368#endif
369}
370
371INLINE void
372coro_times_add (struct coro *c)
373{
374 c->t_real [1] += time_real [1];
375 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
376 c->t_real [0] += time_real [0];
377
378 c->t_cpu [1] += time_cpu [1];
379 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
380 c->t_cpu [0] += time_cpu [0];
381}
382
383INLINE void
384coro_times_sub (struct coro *c)
385{
386 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
387 c->t_real [1] -= time_real [1];
388 c->t_real [0] -= time_real [0];
389
390 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
391 c->t_cpu [1] -= time_cpu [1];
392 c->t_cpu [0] -= time_cpu [0];
393}
394
395/*****************************************************************************/
396/* magic glue */
397
398#define CORO_MAGIC_type_cv 26
399#define CORO_MAGIC_type_state PERL_MAGIC_ext
400
401#define CORO_MAGIC_NN(sv, type) \
402 (expect_true (SvMAGIC (sv)->mg_type == type) \
403 ? SvMAGIC (sv) \
404 : mg_find (sv, type))
405
406#define CORO_MAGIC(sv, type) \
407 (expect_true (SvMAGIC (sv)) \
408 ? CORO_MAGIC_NN (sv, type) \
409 : 0)
410
411#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
412#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
413
414INLINE struct coro *
415SvSTATE_ (pTHX_ SV *coro)
416{
417 HV *stash;
418 MAGIC *mg;
419
420 if (SvROK (coro))
421 coro = SvRV (coro);
422
423 if (expect_false (SvTYPE (coro) != SVt_PVHV))
424 croak ("Coro::State object required");
425
426 stash = SvSTASH (coro);
427 if (expect_false (stash != coro_stash && stash != coro_state_stash))
428 {
429 /* very slow, but rare, check */
430 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
431 croak ("Coro::State object required");
432 }
433
434 mg = CORO_MAGIC_state (coro);
435 return (struct coro *)mg->mg_ptr;
436}
437
438#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
439
440/* faster than SvSTATE, but expects a coroutine hv */
441#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
442#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
443
444/*****************************************************************************/
445/* padlist management and caching */
446
328static AV * 447static AV *
329coro_clone_padlist (pTHX_ CV *cv) 448coro_derive_padlist (pTHX_ CV *cv)
330{ 449{
331 AV *padlist = CvPADLIST (cv); 450 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 451 AV *newpadlist, *newpad;
333 452
334 newpadlist = newAV (); 453 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 458 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 459#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 460 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 461 --AvFILLp (padlist);
343 462
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 463 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 464 av_store (newpadlist, 1, (SV *)newpad);
346 465
347 return newpadlist; 466 return newpadlist;
348} 467}
349 468
350static void 469static void
351free_padlist (pTHX_ AV *padlist) 470free_padlist (pTHX_ AV *padlist)
352{ 471{
353 /* may be during global destruction */ 472 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 473 if (!IN_DESTRUCT)
355 { 474 {
356 I32 i = AvFILLp (padlist); 475 I32 i = AvFILLp (padlist);
357 while (i >= 0) 476
477 while (i > 0) /* special-case index 0 */
358 { 478 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 479 /* we try to be extra-careful here */
360 if (svp) 480 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 481 I32 j = AvFILLp (av);
362 SV *sv; 482
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 483 while (j >= 0)
484 SvREFCNT_dec (AvARRAY (av)[j--]);
485
486 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 487 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 488 }
369 489
490 SvREFCNT_dec (AvARRAY (padlist)[0]);
491
492 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 493 SvREFCNT_dec ((SV*)padlist);
371 } 494 }
372} 495}
373 496
374static int 497static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 498coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 499{
377 AV *padlist; 500 AV *padlist;
378 AV *av = (AV *)mg->mg_obj; 501 AV *av = (AV *)mg->mg_obj;
502
503 /* perl manages to free our internal AV and _then_ call us */
504 if (IN_DESTRUCT)
505 return 0;
379 506
380 /* casting is fun. */ 507 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 508 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 509 free_padlist (aTHX_ padlist);
383 510
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 511 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 512
386 return 0; 513 return 0;
387} 514}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 515
392static MGVTBL coro_cv_vtbl = { 516static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 517 0, 0, 0, 0,
394 coro_cv_free 518 coro_cv_free
395}; 519};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 520
440/* the next two functions merely cache the padlists */ 521/* the next two functions merely cache the padlists */
441static void 522static void
442get_padlist (pTHX_ CV *cv) 523get_padlist (pTHX_ CV *cv)
443{ 524{
… …
454 CV *cp = Perl_cv_clone (aTHX_ cv); 535 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 536 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 537 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 538 SvREFCNT_dec (cp);
458#else 539#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 540 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 541#endif
461 } 542 }
462} 543}
463 544
464static void 545static void
… …
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 552 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 553
473 av = (AV *)mg->mg_obj; 554 av = (AV *)mg->mg_obj;
474 555
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 556 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 557 av_extend (av, AvFILLp (av) + 1);
477 558
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 559 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 560}
480 561
481/** load & save, init *******************************************************/ 562/** load & save, init *******************************************************/
563
564/* swap sv heads, at least logically */
565static void
566swap_svs (pTHX_ Coro__State c)
567{
568 int i;
569
570 for (i = 0; i <= AvFILLp (c->swap_sv); )
571 {
572 SV *a = AvARRAY (c->swap_sv)[i++];
573 SV *b = AvARRAY (c->swap_sv)[i++];
574
575 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
576 SV tmp;
577
578 /* swap sv_any */
579 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
580
581 /* swap sv_flags */
582 SvFLAGS (&tmp) = SvFLAGS (a);
583 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
584 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
585
586#if PERL_VERSION_ATLEAST (5,10,0)
587 /* perl 5.10 complicates this _quite_ a bit, but it also is
588 * is much faster, so no quarrels here. alternatively, we could
589 * sv_upgrade to avoid this.
590 */
591 {
592 /* swap sv_u */
593 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
594
595 /* if SvANY points to the head, we need to adjust the pointers,
596 * as the pointer for a still points to b, and maybe vice versa.
597 */
598 #define svany_in_head(type) \
599 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
600
601 if (svany_in_head (SvTYPE (a)))
602 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
603
604 if (svany_in_head (SvTYPE (b)))
605 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
606 }
607#endif
608 }
609}
610
611#define SWAP_SVS(coro) \
612 if (expect_false ((coro)->swap_sv)) \
613 swap_svs (aTHX_ (coro))
614
615static void
616on_enterleave_call (pTHX_ SV *cb);
482 617
483static void 618static void
484load_perl (pTHX_ Coro__State c) 619load_perl (pTHX_ Coro__State c)
485{ 620{
486 perl_slots *slot = c->slot; 621 perl_slots *slot = c->slot;
487 c->slot = 0; 622 c->slot = 0;
488 623
489 PL_mainstack = c->mainstack; 624 PL_mainstack = c->mainstack;
490 625
491 GvSV (PL_defgv) = slot->defsv; 626 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 627 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 628 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 629 GvSV (irsgv) = slot->irsgv;
630 GvHV (PL_hintgv) = slot->hinthv;
495 631
496 #define VAR(name,type) PL_ ## name = slot->name; 632 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 633 # include "state.h"
498 #undef VAR 634 #undef VAR
499 635
… …
513 PUTBACK; 649 PUTBACK;
514 } 650 }
515 651
516 slf_frame = c->slf_frame; 652 slf_frame = c->slf_frame;
517 CORO_THROW = c->except; 653 CORO_THROW = c->except;
654
655 if (expect_false (enable_times))
656 {
657 if (expect_false (!times_valid))
658 coro_times_update ();
659
660 coro_times_sub (c);
661 }
662
663 if (expect_false (c->on_enter))
664 {
665 int i;
666
667 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
668 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
669 }
670
671 SWAP_SVS (c);
518} 672}
519 673
520static void 674static void
521save_perl (pTHX_ Coro__State c) 675save_perl (pTHX_ Coro__State c)
522{ 676{
677 SWAP_SVS (c);
678
679 if (expect_false (c->on_leave))
680 {
681 int i;
682
683 for (i = AvFILLp (c->on_leave); i >= 0; --i)
684 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
685 }
686
687 times_valid = 0;
688
689 if (expect_false (enable_times))
690 {
691 coro_times_update (); times_valid = 1;
692 coro_times_add (c);
693 }
694
523 c->except = CORO_THROW; 695 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 696 c->slf_frame = slf_frame;
525 697
526 { 698 {
527 dSP; 699 dSP;
… …
540 { 712 {
541 while (expect_true (cxix >= 0)) 713 while (expect_true (cxix >= 0))
542 { 714 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 715 PERL_CONTEXT *cx = &ccstk[cxix--];
544 716
545 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 717 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
546 { 718 {
547 CV *cv = cx->blk_sub.cv; 719 CV *cv = cx->blk_sub.cv;
548 720
549 if (expect_true (CvDEPTH (cv))) 721 if (expect_true (CvDEPTH (cv)))
550 { 722 {
551 EXTEND (SP, 3);
552 PUSHs ((SV *)CvPADLIST (cv)); 723 PUSHs ((SV *)CvPADLIST (cv));
553 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv))); 724 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
554 PUSHs ((SV *)cv); 725 PUSHs ((SV *)cv);
555 726
556 CvDEPTH (cv) = 0; 727 CvDEPTH (cv) = 0;
… …
574 /* we manually unroll here, as usually 2 slots is enough */ 745 /* we manually unroll here, as usually 2 slots is enough */
575 if (SLOT_COUNT >= 1) CXINC; 746 if (SLOT_COUNT >= 1) CXINC;
576 if (SLOT_COUNT >= 2) CXINC; 747 if (SLOT_COUNT >= 2) CXINC;
577 if (SLOT_COUNT >= 3) CXINC; 748 if (SLOT_COUNT >= 3) CXINC;
578 { 749 {
579 int i; 750 unsigned int i;
580 for (i = 3; i < SLOT_COUNT; ++i) 751 for (i = 3; i < SLOT_COUNT; ++i)
581 CXINC; 752 CXINC;
582 } 753 }
583 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 754 cxstack_ix -= SLOT_COUNT; /* undo allocation */
584 755
585 c->mainstack = PL_mainstack; 756 c->mainstack = PL_mainstack;
586 757
587 { 758 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 759 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 760
590 slot->defav = GvAV (PL_defgv); 761 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 762 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 763 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 764 slot->irsgv = GvSV (irsgv);
765 slot->hinthv = GvHV (PL_hintgv);
594 766
595 #define VAR(name,type) slot->name = PL_ ## name; 767 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 768 # include "state.h"
597 #undef VAR 769 #undef VAR
598 } 770 }
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 848#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 849 Safefree (PL_retstack);
678#endif 850#endif
679} 851}
680 852
853#define CORO_RSS \
854 rss += sizeof (SYM (curstackinfo)); \
855 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
856 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
857 rss += SYM (tmps_max) * sizeof (SV *); \
858 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
859 rss += SYM (scopestack_max) * sizeof (I32); \
860 rss += SYM (savestack_max) * sizeof (ANY);
861
681static size_t 862static size_t
682coro_rss (pTHX_ struct coro *coro) 863coro_rss (pTHX_ struct coro *coro)
683{ 864{
684 size_t rss = sizeof (*coro); 865 size_t rss = sizeof (*coro);
685 866
686 if (coro->mainstack) 867 if (coro->mainstack)
687 { 868 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 869 if (coro->flags & CF_RUNNING)
692 { 870 {
693 slot = &tmp_slot; 871 #define SYM(sym) PL_ ## sym
694 872 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 873 #undef SYM
698 } 874 }
699 else 875 else
700 slot = coro->slot;
701
702 if (slot)
703 { 876 {
704 rss += sizeof (slot->curstackinfo); 877 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 878 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 879 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 880 }
716 } 881 }
717 882
718 return rss; 883 return rss;
719} 884}
… …
732#endif 897#endif
733 898
734/* 899/*
735 * This overrides the default magic get method of %SIG elements. 900 * This overrides the default magic get method of %SIG elements.
736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 901 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
737 * and instead of tryign to save and restore the hash elements, we just provide 902 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 903 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 904 */
743static int 905static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 906coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 907{
746 const char *s = MgPV_nolen_const (mg); 908 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 961 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 962
801 if (svp) 963 if (svp)
802 { 964 {
803 SV *old = *svp; 965 SV *old = *svp;
804 *svp = newSVsv (sv); 966 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 967 SvREFCNT_dec (old);
806 return 0; 968 return 0;
807 } 969 }
808 } 970 }
809 971
… …
821slf_check_nop (pTHX_ struct CoroSLF *frame) 983slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 984{
823 return 0; 985 return 0;
824} 986}
825 987
826static UNOP coro_setup_op; 988static int
989slf_check_repeat (pTHX_ struct CoroSLF *frame)
990{
991 return 1;
992}
993
994static UNOP init_perl_op;
827 995
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 996static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 997init_perl (pTHX_ struct coro *coro)
830{ 998{
831 /* 999 /*
832 * emulate part of the perl startup here. 1000 * emulate part of the perl startup here.
833 */ 1001 */
834 coro_init_stacks (aTHX); 1002 coro_init_stacks (aTHX);
835 1003
836 PL_runops = RUNOPS_DEFAULT; 1004 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1005 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1006 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1007 PL_comppad = 0;
1008 PL_comppad_name = 0;
1009 PL_comppad_name_fill = 0;
1010 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1011 PL_curpm = 0;
841 PL_curpad = 0; 1012 PL_curpad = 0;
842 PL_localizing = 0; 1013 PL_localizing = 0;
843 PL_dirty = 0; 1014 PL_dirty = 0;
844 PL_restartop = 0; 1015 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1016#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1017 PL_parser = 0;
847#endif 1018#endif
1019 PL_hints = 0;
848 1020
849 /* recreate the die/warn hooks */ 1021 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1022 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1023 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1024
853 GvSV (PL_defgv) = newSV (0); 1025 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1026 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1027 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1028 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1029 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1030 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1031 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1032
860 { 1033 {
861 dSP; 1034 dSP;
862 UNOP myop; 1035 UNOP myop;
863 1036
864 Zero (&myop, 1, UNOP); 1037 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1038 myop.op_next = Nullop;
1039 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1040 myop.op_flags = OPf_WANT_VOID;
867 1041
868 PUSHMARK (SP); 1042 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1043 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1044 PUTBACK;
871 PL_op = (OP *)&myop; 1045 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1046 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1047 }
875 1048
876 /* this newly created coroutine might be run on an existing cctx which most 1049 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1050 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1051 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1052 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1053 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1054
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1055 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 1056 init_perl_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1057 init_perl_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1058 init_perl_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1059 /* no flags etc. required, as an init function won't be called */
887 1060
888 PL_op = (OP *)&coro_setup_op; 1061 PL_op = (OP *)&init_perl_op;
889 1062
890 /* copy throw, in case it was set before coro_setup */ 1063 /* copy throw, in case it was set before init_perl */
891 CORO_THROW = coro->except; 1064 CORO_THROW = coro->except;
892}
893 1065
1066 SWAP_SVS (coro);
1067
1068 if (expect_false (enable_times))
1069 {
1070 coro_times_update ();
1071 coro_times_sub (coro);
1072 }
1073}
1074
894static void 1075static void
895coro_destruct (pTHX_ struct coro *coro) 1076coro_unwind_stacks (pTHX)
896{ 1077{
897 if (!IN_DESTRUCT) 1078 if (!IN_DESTRUCT)
898 { 1079 {
899 /* restore all saved variables and stuff */ 1080 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1081 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1089 POPSTACK_TO (PL_mainstack);
909 1090
910 /* unwind main stack */ 1091 /* unwind main stack */
911 dounwind (-1); 1092 dounwind (-1);
912 } 1093 }
1094}
913 1095
914 SvREFCNT_dec (GvSV (PL_defgv)); 1096static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1097destroy_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1098{
917 SvREFCNT_dec (PL_defoutgv); 1099 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1100
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1101 {
924 SvREFCNT_dec (CORO_THROW); 1102 struct coro *current = SvSTATE_current;
1103
1104 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1105
1106 save_perl (aTHX_ current);
1107 load_perl (aTHX_ coro);
1108
1109 coro_unwind_stacks (aTHX);
1110 coro_destruct_stacks (aTHX);
1111
1112 /* restore swapped sv's */
1113 SWAP_SVS (coro);
1114
1115 // now save some sv's to be free'd later
1116 svf [0] = GvSV (PL_defgv);
1117 svf [1] = (SV *)GvAV (PL_defgv);
1118 svf [2] = GvSV (PL_errgv);
1119 svf [3] = (SV *)PL_defoutgv;
1120 svf [4] = PL_rs;
1121 svf [5] = GvSV (irsgv);
1122 svf [6] = (SV *)GvHV (PL_hintgv);
1123 svf [7] = PL_diehook;
1124 svf [8] = PL_warnhook;
1125 assert (9 == sizeof (svf) / sizeof (*svf));
1126
1127 load_perl (aTHX_ current);
1128 }
1129
1130 {
1131 unsigned int i;
1132
1133 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1134 SvREFCNT_dec (svf [i]);
1135
925 SvREFCNT_dec (coro->saved_deffh); 1136 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1137 SvREFCNT_dec (coro->rouse_cb);
927 1138 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1139 SvREFCNT_dec (coro->invoke_av);
1140 }
929} 1141}
930 1142
931INLINE void 1143INLINE void
932free_coro_mortal (pTHX) 1144free_coro_mortal (pTHX)
933{ 1145{
… …
941static int 1153static int
942runops_trace (pTHX) 1154runops_trace (pTHX)
943{ 1155{
944 COP *oldcop = 0; 1156 COP *oldcop = 0;
945 int oldcxix = -2; 1157 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1158
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1159 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1160 {
951 PERL_ASYNC_CHECK (); 1161 PERL_ASYNC_CHECK ();
952 1162
953 if (cctx->flags & CC_TRACE_ALL) 1163 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1164 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1165 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1166 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1167 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1168 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1169 AV *av = newAV (); /* return values */
960 SV **cb; 1170 SV **cb;
… …
997 1207
998 if (PL_curcop != &PL_compiling) 1208 if (PL_curcop != &PL_compiling)
999 { 1209 {
1000 SV **cb; 1210 SV **cb;
1001 1211
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1212 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1213 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1214 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1215
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1216 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1217 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1218 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1219 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1220 SV *fullname = sv_2mortal (newSV (0));
1012 1221
1013 if (isGV (gv)) 1222 if (isGV (gv))
… …
1018 SAVETMPS; 1227 SAVETMPS;
1019 EXTEND (SP, 3); 1228 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1229 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1230 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1231 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1232 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1233 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1234 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1235 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1236 SPAGAIN;
1028 FREETMPS; 1237 FREETMPS;
… …
1031 } 1240 }
1032 1241
1033 oldcxix = cxstack_ix; 1242 oldcxix = cxstack_ix;
1034 } 1243 }
1035 1244
1036 if (cctx->flags & CC_TRACE_LINE) 1245 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1246 {
1038 dSP; 1247 dSP;
1039 1248
1040 PL_runops = RUNOPS_DEFAULT; 1249 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1250 ENTER;
… …
1060 1269
1061 TAINT_NOT; 1270 TAINT_NOT;
1062 return 0; 1271 return 0;
1063} 1272}
1064 1273
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1274static struct CoroSLF cctx_ssl_frame;
1067 1275
1068static void 1276static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1277slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1278{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1279 ta->prev = 0;
1073} 1280}
1074 1281
1075static int 1282static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1283slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1284{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1287 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1288}
1082 1289
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1290/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1291static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1292cctx_prepare (pTHX)
1086{ 1293{
1087 PL_top_env = &PL_start_env; 1294 PL_top_env = &PL_start_env;
1088 1295
1089 if (cctx->flags & CC_TRACE) 1296 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1297 PL_runops = runops_trace;
1091 1298
1092 /* we already must be executing an SLF op, there is no other valid way 1299 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1300 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1301 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1302 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1303
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1304 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1305 cctx_ssl_frame = slf_frame;
1100 1306
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1307 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1308 slf_frame.check = slf_check_set_stacklevel;
1103} 1309}
… …
1126 /* normally we would need to skip the entersub here */ 1332 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1333 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1334 /* PL_nop = PL_nop->op_next */
1129 1335
1130 /* inject a fake subroutine call to cctx_init */ 1336 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1337 cctx_prepare (aTHX);
1132 1338
1133 /* cctx_run is the alternative tail of transfer() */ 1339 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1340 transfer_tail (aTHX);
1135 1341
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1342 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1343 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1344 perl_run (PL_curinterp);
1345 /*
1346 * Unfortunately, there is no way to get at the return values of the
1347 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1348 * runtime errors here, as this is just a random interpreter, not a thread.
1349 */
1139 1350
1140 /* 1351 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1352 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1353 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1354 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1355 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1356 * coroutine as Coro has no such concept.
1357 * This actually isn't valid with the pthread backend, but OSes requiring
1358 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1359 */
1147 PL_top_env = main_top_env; 1360 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1361 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1362 }
1150} 1363}
… …
1227cctx_destroy (coro_cctx *cctx) 1440cctx_destroy (coro_cctx *cctx)
1228{ 1441{
1229 if (!cctx) 1442 if (!cctx)
1230 return; 1443 return;
1231 1444
1445 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1446
1232 --cctx_count; 1447 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1448 coro_destroy (&cctx->cctx);
1234 1449
1235 /* coro_transfer creates new, empty cctx's */ 1450 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1451 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1514 /* TODO: throwing up here is considered harmful */
1300 1515
1301 if (expect_true (prev != next)) 1516 if (expect_true (prev != next))
1302 { 1517 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1518 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1519 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1520
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1521 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1522 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1523
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1524#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1525 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1526 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1527#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1533transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1534{
1323 dSTACKLEVEL; 1535 dSTACKLEVEL;
1324 1536
1325 /* sometimes transfer is only called to set idle_sp */ 1537 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1538 if (expect_false (!prev))
1327 { 1539 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1540 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1541 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1542 }
1331 else if (expect_true (prev != next)) 1543 else if (expect_true (prev != next))
1332 { 1544 {
1333 coro_cctx *prev__cctx; 1545 coro_cctx *cctx_prev;
1334 1546
1335 if (expect_false (prev->flags & CF_NEW)) 1547 if (expect_false (prev->flags & CF_NEW))
1336 { 1548 {
1337 /* create a new empty/source context */ 1549 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1550 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1551 prev->flags |= CF_RUNNING;
1341 } 1552 }
1342 1553
1343 prev->flags &= ~CF_RUNNING; 1554 prev->flags &= ~CF_RUNNING;
… …
1349 if (expect_false (next->flags & CF_NEW)) 1560 if (expect_false (next->flags & CF_NEW))
1350 { 1561 {
1351 /* need to start coroutine */ 1562 /* need to start coroutine */
1352 next->flags &= ~CF_NEW; 1563 next->flags &= ~CF_NEW;
1353 /* setup coroutine call */ 1564 /* setup coroutine call */
1354 coro_setup (aTHX_ next); 1565 init_perl (aTHX_ next);
1355 } 1566 }
1356 else 1567 else
1357 load_perl (aTHX_ next); 1568 load_perl (aTHX_ next);
1358 1569
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1570 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1571 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1572 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1573 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1574 && !force_cctx
1366 )) 1575 ))
1367 { 1576 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1577 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1578 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1579
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1580 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1581 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1582 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1583 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1584 next->cctx = cctx_get (aTHX);
1378 1585
1379 cctx_put (prev__cctx); 1586 cctx_put (cctx_current);
1380 } 1587 }
1588 else
1589 prev->cctx = cctx_current;
1381 1590
1382 ++next->usecount; 1591 ++next->usecount;
1383 1592
1384 if (expect_true (!next->cctx)) 1593 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1594 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1595
1387 if (expect_false (prev__cctx != next->cctx)) 1596 next->cctx = 0;
1597
1598 if (expect_false (cctx_prev != cctx_current))
1388 { 1599 {
1389 prev__cctx->top_env = PL_top_env; 1600 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1601 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1602 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1603 }
1393 1604
1394 transfer_tail (aTHX); 1605 transfer_tail (aTHX);
1395 } 1606 }
1396} 1607}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1615coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1616{
1406 if (coro->flags & CF_DESTROYED) 1617 if (coro->flags & CF_DESTROYED)
1407 return 0; 1618 return 0;
1408 1619
1409 if (coro->on_destroy) 1620 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1621 coro->on_destroy (aTHX_ coro);
1411 1622
1412 coro->flags |= CF_DESTROYED; 1623 coro->flags |= CF_DESTROYED;
1413 1624
1414 if (coro->flags & CF_READY) 1625 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1629 --coro_nready;
1419 } 1630 }
1420 else 1631 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1632 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1633
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1634 if (coro->mainstack
1424 { 1635 && coro->mainstack != main_mainstack
1425 struct coro temp; 1636 && coro->slot
1426 1637 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro); 1638 destroy_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438
1439 cctx_destroy (coro->cctx);
1440 SvREFCNT_dec (coro->args);
1441 1639
1442 if (coro->next) coro->next->prev = coro->prev; 1640 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1641 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1642 if (coro == coro_first) coro_first = coro->next;
1643
1644 cctx_destroy (coro->cctx);
1645 SvREFCNT_dec (coro->startcv);
1646 SvREFCNT_dec (coro->args);
1647 SvREFCNT_dec (coro->swap_sv);
1648 SvREFCNT_dec (CORO_THROW);
1445 1649
1446 return 1; 1650 return 1;
1447} 1651}
1448 1652
1449static int 1653static int
… …
1499 1703
1500 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1704 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1501 TRANSFER (ta, 1); 1705 TRANSFER (ta, 1);
1502} 1706}
1503 1707
1504/*****************************************************************************/
1505/* gensub: simple closure generation utility */
1506
1507#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1508
1509/* create a closure from XS, returns a code reference */
1510/* the arg can be accessed via GENSUB_ARG from the callback */
1511/* the callback must use dXSARGS/XSRETURN */
1512static SV *
1513gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1514{
1515 CV *cv = (CV *)newSV (0);
1516
1517 sv_upgrade ((SV *)cv, SVt_PVCV);
1518
1519 CvANON_on (cv);
1520 CvISXSUB_on (cv);
1521 CvXSUB (cv) = xsub;
1522 GENSUB_ARG = arg;
1523
1524 return newRV_noinc ((SV *)cv);
1525}
1526
1527/** Coro ********************************************************************/ 1708/** Coro ********************************************************************/
1528 1709
1529INLINE void 1710INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1711coro_enq (pTHX_ struct coro *coro)
1531{ 1712{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1713 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1714
1535INLINE SV * 1715 SvREFCNT_inc_NN (coro->hv);
1716
1717 coro->next_ready = 0;
1718 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1719 ready [1] = coro;
1720}
1721
1722INLINE struct coro *
1536coro_deq (pTHX) 1723coro_deq (pTHX)
1537{ 1724{
1538 int prio; 1725 int prio;
1539 1726
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1727 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1728 {
1542 return av_shift (coro_ready [prio]); 1729 struct coro **ready = coro_ready [prio];
1730
1731 if (ready [0])
1732 {
1733 struct coro *coro = ready [0];
1734 ready [0] = coro->next_ready;
1735 return coro;
1736 }
1737 }
1543 1738
1544 return 0; 1739 return 0;
1740}
1741
1742static void
1743invoke_sv_ready_hook_helper (void)
1744{
1745 dTHX;
1746 dSP;
1747
1748 ENTER;
1749 SAVETMPS;
1750
1751 PUSHMARK (SP);
1752 PUTBACK;
1753 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1754
1755 FREETMPS;
1756 LEAVE;
1545} 1757}
1546 1758
1547static int 1759static int
1548api_ready (pTHX_ SV *coro_sv) 1760api_ready (pTHX_ SV *coro_sv)
1549{ 1761{
1550 struct coro *coro;
1551 SV *sv_hook;
1552 void (*xs_hook)(void);
1553
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1762 struct coro *coro = SvSTATE (coro_sv);
1558 1763
1559 if (coro->flags & CF_READY) 1764 if (coro->flags & CF_READY)
1560 return 0; 1765 return 0;
1561 1766
1562 coro->flags |= CF_READY; 1767 coro->flags |= CF_READY;
1563 1768
1564 sv_hook = coro_nready ? 0 : coro_readyhook;
1565 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1566
1567 coro_enq (aTHX_ coro); 1769 coro_enq (aTHX_ coro);
1568 ++coro_nready;
1569 1770
1570 if (sv_hook) 1771 if (!coro_nready++)
1571 { 1772 if (coroapi.readyhook)
1572 dSP; 1773 coroapi.readyhook ();
1573
1574 ENTER;
1575 SAVETMPS;
1576
1577 PUSHMARK (SP);
1578 PUTBACK;
1579 call_sv (sv_hook, G_VOID | G_DISCARD);
1580
1581 FREETMPS;
1582 LEAVE;
1583 }
1584
1585 if (xs_hook)
1586 xs_hook ();
1587 1774
1588 return 1; 1775 return 1;
1589} 1776}
1590 1777
1591static int 1778static int
1592api_is_ready (pTHX_ SV *coro_sv) 1779api_is_ready (pTHX_ SV *coro_sv)
1593{ 1780{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1781 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1782}
1596 1783
1784/* expects to own a reference to next->hv */
1597INLINE void 1785INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1786prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1787{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1788 SV *prev_sv = SvRV (coro_current);
1789
1639 ta->prev = SvSTATE_hv (prev_sv); 1790 ta->prev = SvSTATE_hv (prev_sv);
1791 ta->next = next;
1792
1640 TRANSFER_CHECK (*ta); 1793 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1794
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1795 SvRV_set (coro_current, (SV *)next->hv);
1644 1796
1645 free_coro_mortal (aTHX); 1797 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1798 coro_mortal = prev_sv;
1647} 1799}
1648 1800
1801static void
1802prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1803{
1804 for (;;)
1805 {
1806 struct coro *next = coro_deq (aTHX);
1807
1808 if (expect_true (next))
1809 {
1810 /* cannot transfer to destroyed coros, skip and look for next */
1811 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1812 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1813 else
1814 {
1815 next->flags &= ~CF_READY;
1816 --coro_nready;
1817
1818 prepare_schedule_to (aTHX_ ta, next);
1819 break;
1820 }
1821 }
1822 else
1823 {
1824 /* nothing to schedule: call the idle handler */
1825 if (SvROK (sv_idle)
1826 && SvOBJECT (SvRV (sv_idle)))
1827 {
1828 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1829 api_ready (aTHX_ SvRV (sv_idle));
1830 --coro_nready;
1831 }
1832 else
1833 {
1834 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1835 dSP;
1836
1837 ENTER;
1838 SAVETMPS;
1839
1840 PUSHMARK (SP);
1841 PUTBACK;
1842 call_sv (sv_idle, G_VOID | G_DISCARD);
1843
1844 FREETMPS;
1845 LEAVE;
1846 }
1847 }
1848 }
1849}
1850
1649INLINE void 1851INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1852prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1853{
1652 api_ready (aTHX_ coro_current); 1854 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1855 prepare_schedule (aTHX_ ta);
… …
1672{ 1874{
1673 struct coro_transfer_args ta; 1875 struct coro_transfer_args ta;
1674 1876
1675 prepare_schedule (aTHX_ &ta); 1877 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1878 TRANSFER (ta, 1);
1879}
1880
1881static void
1882api_schedule_to (pTHX_ SV *coro_sv)
1883{
1884 struct coro_transfer_args ta;
1885 struct coro *next = SvSTATE (coro_sv);
1886
1887 SvREFCNT_inc_NN (coro_sv);
1888 prepare_schedule_to (aTHX_ &ta, next);
1677} 1889}
1678 1890
1679static int 1891static int
1680api_cede (pTHX) 1892api_cede (pTHX)
1681{ 1893{
… …
1710static void 1922static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1923api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1924{
1713 struct coro *coro = SvSTATE (coro_sv); 1925 struct coro *coro = SvSTATE (coro_sv);
1714 1926
1927 if (coro->flags & CF_RUNNING)
1928 croak ("cannot enable tracing on a running coroutine, caught");
1929
1715 if (flags & CC_TRACE) 1930 if (flags & CC_TRACE)
1716 { 1931 {
1717 if (!coro->cctx) 1932 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1933 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1934 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1935 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1936
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1937 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1938 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1939 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1940 {
… …
1730 else 1945 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1946 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1947 }
1733} 1948}
1734 1949
1950static void
1951coro_call_on_destroy (pTHX_ struct coro *coro)
1952{
1953 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1954 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1955
1956 if (on_destroyp)
1957 {
1958 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1959
1960 while (AvFILLp (on_destroy) >= 0)
1961 {
1962 dSP; /* don't disturb outer sp */
1963 SV *cb = av_pop (on_destroy);
1964
1965 PUSHMARK (SP);
1966
1967 if (statusp)
1968 {
1969 int i;
1970 AV *status = (AV *)SvRV (*statusp);
1971 EXTEND (SP, AvFILLp (status) + 1);
1972
1973 for (i = 0; i <= AvFILLp (status); ++i)
1974 PUSHs (AvARRAY (status)[i]);
1975 }
1976
1977 PUTBACK;
1978 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1979 }
1980 }
1981}
1982
1983static void
1984slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1985{
1986 int i;
1987 HV *hv = (HV *)SvRV (coro_current);
1988 AV *av = newAV ();
1989
1990 /* items are actually not so common, so optimise for this case */
1991 if (items)
1992 {
1993 av_extend (av, items - 1);
1994
1995 for (i = 0; i < items; ++i)
1996 av_push (av, SvREFCNT_inc_NN (arg [i]));
1997 }
1998
1999 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2000
2001 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2002 api_ready (aTHX_ sv_manager);
2003
2004 frame->prepare = prepare_schedule;
2005 frame->check = slf_check_repeat;
2006
2007 /* as a minor optimisation, we could unwind all stacks here */
2008 /* but that puts extra pressure on pp_slf, and is not worth much */
2009 /*coro_unwind_stacks (aTHX);*/
2010}
2011
2012/*****************************************************************************/
2013/* async pool handler */
2014
2015static int
2016slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2017{
2018 HV *hv = (HV *)SvRV (coro_current);
2019 struct coro *coro = (struct coro *)frame->data;
2020
2021 if (!coro->invoke_cb)
2022 return 1; /* loop till we have invoke */
2023 else
2024 {
2025 hv_store (hv, "desc", sizeof ("desc") - 1,
2026 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2027
2028 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2029
2030 {
2031 dSP;
2032 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2033 PUTBACK;
2034 }
2035
2036 SvREFCNT_dec (GvAV (PL_defgv));
2037 GvAV (PL_defgv) = coro->invoke_av;
2038 coro->invoke_av = 0;
2039
2040 return 0;
2041 }
2042}
2043
2044static void
2045slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2046{
2047 HV *hv = (HV *)SvRV (coro_current);
2048 struct coro *coro = SvSTATE_hv ((SV *)hv);
2049
2050 if (expect_true (coro->saved_deffh))
2051 {
2052 /* subsequent iteration */
2053 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2054 coro->saved_deffh = 0;
2055
2056 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2057 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2058 {
2059 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2060 coro->invoke_av = newAV ();
2061
2062 frame->prepare = prepare_nop;
2063 }
2064 else
2065 {
2066 av_clear (GvAV (PL_defgv));
2067 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2068
2069 coro->prio = 0;
2070
2071 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2072 api_trace (aTHX_ coro_current, 0);
2073
2074 frame->prepare = prepare_schedule;
2075 av_push (av_async_pool, SvREFCNT_inc (hv));
2076 }
2077 }
2078 else
2079 {
2080 /* first iteration, simply fall through */
2081 frame->prepare = prepare_nop;
2082 }
2083
2084 frame->check = slf_check_pool_handler;
2085 frame->data = (void *)coro;
2086}
2087
1735/*****************************************************************************/ 2088/*****************************************************************************/
1736/* rouse callback */ 2089/* rouse callback */
1737 2090
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2091#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2092
1740static void 2093static void
1741coro_rouse_callback (pTHX_ CV *cv) 2094coro_rouse_callback (pTHX_ CV *cv)
1742{ 2095{
1743 dXSARGS; 2096 dXSARGS;
1744 SV *data = (SV *)GENSUB_ARG; 2097 SV *data = (SV *)S_GENSUB_ARG;
1745 2098
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2099 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2100 {
1748 /* first call, set args */ 2101 /* first call, set args */
1749 int i; 2102 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2103 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2104
1753 SvRV_set (data, (SV *)av); 2105 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2106
1757 /* better take a full copy of the arguments */ 2107 /* better take a full copy of the arguments */
1758 while (items--) 2108 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2109 av_store (av, items, newSVsv (ST (items)));
2110
2111 api_ready (aTHX_ coro);
2112 SvREFCNT_dec (coro);
1760 } 2113 }
1761 2114
1762 XSRETURN_EMPTY; 2115 XSRETURN_EMPTY;
1763} 2116}
1764 2117
… …
1781 2134
1782 EXTEND (SP, AvFILLp (av) + 1); 2135 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2136 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2137 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2138
1786 /* we have stolen the elements, so ste length to zero and free */ 2139 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2140 AvFILLp (av) = -1;
1788 av_undef (av); 2141 av_undef (av);
1789 2142
1790 PUTBACK; 2143 PUTBACK;
1791 } 2144 }
… …
1815 || SvTYPE (SvRV (cb)) != SVt_PVCV 2168 || SvTYPE (SvRV (cb)) != SVt_PVCV
1816 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2169 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1817 croak ("Coro::rouse_wait called with illegal callback argument,"); 2170 croak ("Coro::rouse_wait called with illegal callback argument,");
1818 2171
1819 { 2172 {
1820 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2173 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1821 SV *data = (SV *)GENSUB_ARG; 2174 SV *data = (SV *)S_GENSUB_ARG;
1822 2175
1823 frame->data = (void *)data; 2176 frame->data = (void *)data;
1824 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2177 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1825 frame->check = slf_check_rouse_wait; 2178 frame->check = slf_check_rouse_wait;
1826 } 2179 }
… …
1830coro_new_rouse_cb (pTHX) 2183coro_new_rouse_cb (pTHX)
1831{ 2184{
1832 HV *hv = (HV *)SvRV (coro_current); 2185 HV *hv = (HV *)SvRV (coro_current);
1833 struct coro *coro = SvSTATE_hv (hv); 2186 struct coro *coro = SvSTATE_hv (hv);
1834 SV *data = newRV_inc ((SV *)hv); 2187 SV *data = newRV_inc ((SV *)hv);
1835 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2188 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1836 2189
1837 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2190 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1838 SvREFCNT_dec (data); /* magicext increases the refcount */ 2191 SvREFCNT_dec (data); /* magicext increases the refcount */
1839 2192
1840 SvREFCNT_dec (coro->rouse_cb); 2193 SvREFCNT_dec (coro->rouse_cb);
… …
1895static void 2248static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2249slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2250{
1898 frame->prepare = prepare_schedule; 2251 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2252 frame->check = slf_check_nop;
2253}
2254
2255static void
2256slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2257{
2258 struct coro *next = (struct coro *)slf_frame.data;
2259
2260 SvREFCNT_inc_NN (next->hv);
2261 prepare_schedule_to (aTHX_ ta, next);
2262}
2263
2264static void
2265slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2266{
2267 if (!items)
2268 croak ("Coro::schedule_to expects a coroutine argument, caught");
2269
2270 frame->data = (void *)SvSTATE (arg [0]);
2271 frame->prepare = slf_prepare_schedule_to;
2272 frame->check = slf_check_nop;
2273}
2274
2275static void
2276slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2277{
2278 api_ready (aTHX_ SvRV (coro_current));
2279
2280 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2281}
1901 2282
1902static void 2283static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2284slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2285{
… …
2050 } 2431 }
2051 else 2432 else
2052 slf_argc = 0; 2433 slf_argc = 0;
2053 2434
2054 PL_op->op_ppaddr = pp_slf; 2435 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2436 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2437
2057 PL_op = (OP *)&slf_restore; 2438 PL_op = (OP *)&slf_restore;
2439}
2440
2441/*****************************************************************************/
2442/* dynamic wind */
2443
2444static void
2445on_enterleave_call (pTHX_ SV *cb)
2446{
2447 dSP;
2448
2449 PUSHSTACK;
2450
2451 PUSHMARK (SP);
2452 PUTBACK;
2453 call_sv (cb, G_VOID | G_DISCARD);
2454 SPAGAIN;
2455
2456 POPSTACK;
2457}
2458
2459static SV *
2460coro_avp_pop_and_free (pTHX_ AV **avp)
2461{
2462 AV *av = *avp;
2463 SV *res = av_pop (av);
2464
2465 if (AvFILLp (av) < 0)
2466 {
2467 *avp = 0;
2468 SvREFCNT_dec (av);
2469 }
2470
2471 return res;
2472}
2473
2474static void
2475coro_pop_on_enter (pTHX_ void *coro)
2476{
2477 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2478 SvREFCNT_dec (cb);
2479}
2480
2481static void
2482coro_pop_on_leave (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2485 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2486}
2059 2487
2060/*****************************************************************************/ 2488/*****************************************************************************/
2061/* PerlIO::cede */ 2489/* PerlIO::cede */
2062 2490
… …
2136/* Coro::Semaphore & Coro::Signal */ 2564/* Coro::Semaphore & Coro::Signal */
2137 2565
2138static SV * 2566static SV *
2139coro_waitarray_new (pTHX_ int count) 2567coro_waitarray_new (pTHX_ int count)
2140{ 2568{
2141 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2569 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2142 AV *av = newAV (); 2570 AV *av = newAV ();
2143 SV **ary; 2571 SV **ary;
2144 2572
2145 /* unfortunately, building manually saves memory */ 2573 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2574 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2575 AvALLOC (av) = ary;
2576#if PERL_VERSION_ATLEAST (5,10,0)
2148 /*AvARRAY (av) = ary;*/ 2577 AvARRAY (av) = ary;
2578#else
2149 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2579 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2580 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2581 SvPVX ((SV *)av) = (char *)ary;
2582#endif
2150 AvMAX (av) = 1; 2583 AvMAX (av) = 1;
2151 AvFILLp (av) = 0; 2584 AvFILLp (av) = 0;
2152 ary [0] = newSViv (count); 2585 ary [0] = newSViv (count);
2153 2586
2154 return newRV_noinc ((SV *)av); 2587 return newRV_noinc ((SV *)av);
… …
2174 AvARRAY (av)[0] = AvARRAY (av)[1]; 2607 AvARRAY (av)[0] = AvARRAY (av)[1];
2175 AvARRAY (av)[1] = count_sv; 2608 AvARRAY (av)[1] = count_sv;
2176 cb = av_shift (av); 2609 cb = av_shift (av);
2177 2610
2178 if (SvOBJECT (cb)) 2611 if (SvOBJECT (cb))
2612 {
2179 api_ready (aTHX_ cb); 2613 api_ready (aTHX_ cb);
2180 else 2614 --count;
2181 croak ("callbacks not yet supported"); 2615 }
2616 else if (SvTYPE (cb) == SVt_PVCV)
2617 {
2618 dSP;
2619 PUSHMARK (SP);
2620 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2621 PUTBACK;
2622 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2623 }
2182 2624
2183 SvREFCNT_dec (cb); 2625 SvREFCNT_dec (cb);
2184
2185 --count;
2186 } 2626 }
2187} 2627}
2188 2628
2189static void 2629static void
2190coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2630coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2272} 2712}
2273 2713
2274static void 2714static void
2275slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2715slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2276{ 2716{
2717 if (items >= 2)
2718 {
2719 /* callback form */
2720 AV *av = (AV *)SvRV (arg [0]);
2721 SV *cb_cv = s_get_cv_croak (arg [1]);
2722
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2725 if (SvIVX (AvARRAY (av)[0]) > 0)
2726 coro_semaphore_adjust (aTHX_ av, 0);
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else
2732 {
2277 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2733 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2278 frame->check = slf_check_semaphore_wait; 2734 frame->check = slf_check_semaphore_wait;
2735 }
2279} 2736}
2280 2737
2281/* signal */ 2738/* signal */
2282 2739
2283static void 2740static void
… …
2295 AvARRAY (av)[0] = AvARRAY (av)[1]; 2752 AvARRAY (av)[0] = AvARRAY (av)[1];
2296 AvARRAY (av)[1] = cb; 2753 AvARRAY (av)[1] = cb;
2297 2754
2298 cb = av_shift (av); 2755 cb = av_shift (av);
2299 2756
2757 if (SvTYPE (cb) == SVt_PVCV)
2758 {
2759 dSP;
2760 PUSHMARK (SP);
2761 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2762 PUTBACK;
2763 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2764 }
2765 else
2766 {
2300 api_ready (aTHX_ cb); 2767 api_ready (aTHX_ cb);
2301 sv_setiv (cb, 0); /* signal waiter */ 2768 sv_setiv (cb, 0); /* signal waiter */
2769 }
2770
2302 SvREFCNT_dec (cb); 2771 SvREFCNT_dec (cb);
2303 2772
2304 --count; 2773 --count;
2305 } 2774 }
2306} 2775}
… …
2315static void 2784static void
2316slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2785slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2317{ 2786{
2318 AV *av = (AV *)SvRV (arg [0]); 2787 AV *av = (AV *)SvRV (arg [0]);
2319 2788
2789 if (items >= 2)
2790 {
2791 SV *cb_cv = s_get_cv_croak (arg [1]);
2792 av_push (av, SvREFCNT_inc_NN (cb_cv));
2793
2320 if (SvIVX (AvARRAY (av)[0])) 2794 if (SvIVX (AvARRAY (av)[0]))
2795 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2796
2797 frame->prepare = prepare_nop;
2798 frame->check = slf_check_nop;
2799 }
2800 else if (SvIVX (AvARRAY (av)[0]))
2321 { 2801 {
2322 SvIVX (AvARRAY (av)[0]) = 0; 2802 SvIVX (AvARRAY (av)[0]) = 0;
2323 frame->prepare = prepare_nop; 2803 frame->prepare = prepare_nop;
2324 frame->check = slf_check_nop; 2804 frame->check = slf_check_nop;
2325 } 2805 }
2326 else 2806 else
2327 { 2807 {
2328 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2808 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2329 2809
2330 av_push (av, waiter); 2810 av_push (av, waiter);
2331 2811
2332 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2812 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2333 frame->prepare = prepare_schedule; 2813 frame->prepare = prepare_schedule;
… …
2351 2831
2352static void 2832static void
2353coro_aio_callback (pTHX_ CV *cv) 2833coro_aio_callback (pTHX_ CV *cv)
2354{ 2834{
2355 dXSARGS; 2835 dXSARGS;
2356 AV *state = (AV *)GENSUB_ARG; 2836 AV *state = (AV *)S_GENSUB_ARG;
2357 SV *coro = av_pop (state); 2837 SV *coro = av_pop (state);
2358 SV *data_sv = newSV (sizeof (struct io_state)); 2838 SV *data_sv = newSV (sizeof (struct io_state));
2359 2839
2360 av_extend (state, items); 2840 av_extend (state, items - 1);
2361 2841
2362 sv_upgrade (data_sv, SVt_PV); 2842 sv_upgrade (data_sv, SVt_PV);
2363 SvCUR_set (data_sv, sizeof (struct io_state)); 2843 SvCUR_set (data_sv, sizeof (struct io_state));
2364 SvPOK_only (data_sv); 2844 SvPOK_only (data_sv);
2365 2845
… …
2475 2955
2476 for (i = 0; i < items; ++i) 2956 for (i = 0; i < items; ++i)
2477 PUSHs (arg [i]); 2957 PUSHs (arg [i]);
2478 2958
2479 /* now push the callback closure */ 2959 /* now push the callback closure */
2480 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2960 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2481 2961
2482 /* now call the AIO function - we assume our request is uncancelable */ 2962 /* now call the AIO function - we assume our request is uncancelable */
2483 PUTBACK; 2963 PUTBACK;
2484 call_sv ((SV *)req, G_VOID | G_DISCARD); 2964 call_sv ((SV *)req, G_VOID | G_DISCARD);
2485 } 2965 }
… …
2499 2979
2500 XSRETURN_EMPTY; 2980 XSRETURN_EMPTY;
2501} 2981}
2502 2982
2503/*****************************************************************************/ 2983/*****************************************************************************/
2984
2985#if CORO_CLONE
2986# include "clone.c"
2987#endif
2988
2989/*****************************************************************************/
2990
2991static SV *
2992coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2993{
2994 SV *coro_sv;
2995 struct coro *coro;
2996 MAGIC *mg;
2997 HV *hv;
2998 SV *cb;
2999 int i;
3000
3001 if (argc > 0)
3002 {
3003 cb = s_get_cv_croak (argv [0]);
3004
3005 if (!is_coro)
3006 {
3007 if (CvISXSUB (cb))
3008 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3009
3010 if (!CvROOT (cb))
3011 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3012 }
3013 }
3014
3015 Newz (0, coro, 1, struct coro);
3016 coro->args = newAV ();
3017 coro->flags = CF_NEW;
3018
3019 if (coro_first) coro_first->prev = coro;
3020 coro->next = coro_first;
3021 coro_first = coro;
3022
3023 coro->hv = hv = newHV ();
3024 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3025 mg->mg_flags |= MGf_DUP;
3026 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3027
3028 if (argc > 0)
3029 {
3030 av_extend (coro->args, argc + is_coro - 1);
3031
3032 if (is_coro)
3033 {
3034 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3035 cb = (SV *)cv_coro_run;
3036 }
3037
3038 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3039
3040 for (i = 1; i < argc; i++)
3041 av_push (coro->args, newSVsv (argv [i]));
3042 }
3043
3044 return coro_sv;
3045}
2504 3046
2505MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3047MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2506 3048
2507PROTOTYPES: DISABLE 3049PROTOTYPES: DISABLE
2508 3050
… …
2513 coro_thx = PERL_GET_CONTEXT; 3055 coro_thx = PERL_GET_CONTEXT;
2514# endif 3056# endif
2515#endif 3057#endif
2516 BOOT_PAGESIZE; 3058 BOOT_PAGESIZE;
2517 3059
3060 cctx_current = cctx_new_empty ();
3061
2518 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3062 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2519 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3063 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2520 3064
2521 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3065 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2522 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3066 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2541 3085
2542 { 3086 {
2543 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3087 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2544 3088
2545 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3089 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2546 hv_store_ent (PL_custom_op_names, slf, 3090 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2547 newSVpv ("coro_slf", 0), 0);
2548 3091
2549 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3092 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2550 hv_store_ent (PL_custom_op_descs, slf, 3093 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2551 newSVpv ("coro schedule like function", 0), 0);
2552 } 3094 }
2553 3095
2554 coroapi.ver = CORO_API_VERSION; 3096 coroapi.ver = CORO_API_VERSION;
2555 coroapi.rev = CORO_API_REVISION; 3097 coroapi.rev = CORO_API_REVISION;
2556 3098
… …
2568 3110
2569 if (!svp) croak ("Time::HiRes is required"); 3111 if (!svp) croak ("Time::HiRes is required");
2570 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3112 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2571 3113
2572 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3114 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3115
3116 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3117 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2573 } 3118 }
2574 3119
2575 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3120 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2576} 3121}
2577 3122
2578SV * 3123SV *
2579new (char *klass, ...) 3124new (SV *klass, ...)
3125 ALIAS:
3126 Coro::new = 1
2580 CODE: 3127 CODE:
2581{ 3128 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2582 struct coro *coro; 3129 OUTPUT:
2583 MAGIC *mg;
2584 HV *hv;
2585 int i;
2586
2587 Newz (0, coro, 1, struct coro);
2588 coro->args = newAV ();
2589 coro->flags = CF_NEW;
2590
2591 if (coro_first) coro_first->prev = coro;
2592 coro->next = coro_first;
2593 coro_first = coro;
2594
2595 coro->hv = hv = newHV ();
2596 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2597 mg->mg_flags |= MGf_DUP;
2598 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2599
2600 av_extend (coro->args, items - 1);
2601 for (i = 1; i < items; i++)
2602 av_push (coro->args, newSVsv (ST (i)));
2603}
2604 OUTPUT:
2605 RETVAL 3130 RETVAL
2606 3131
2607void 3132void
2608transfer (...) 3133transfer (...)
2609 PROTOTYPE: $$ 3134 PROTOTYPE: $$
… …
2620void 3145void
2621_exit (int code) 3146_exit (int code)
2622 PROTOTYPE: $ 3147 PROTOTYPE: $
2623 CODE: 3148 CODE:
2624 _exit (code); 3149 _exit (code);
3150
3151SV *
3152clone (Coro::State coro)
3153 CODE:
3154{
3155#if CORO_CLONE
3156 struct coro *ncoro = coro_clone (aTHX_ coro);
3157 MAGIC *mg;
3158 /* TODO: too much duplication */
3159 ncoro->hv = newHV ();
3160 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3161 mg->mg_flags |= MGf_DUP;
3162 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3163#else
3164 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3165#endif
3166}
3167 OUTPUT:
3168 RETVAL
2625 3169
2626int 3170int
2627cctx_stacksize (int new_stacksize = 0) 3171cctx_stacksize (int new_stacksize = 0)
2628 PROTOTYPE: ;$ 3172 PROTOTYPE: ;$
2629 CODE: 3173 CODE:
… …
2679 eval = 1 3223 eval = 1
2680 CODE: 3224 CODE:
2681{ 3225{
2682 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3226 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2683 { 3227 {
2684 struct coro temp; 3228 struct coro *current = SvSTATE_current;
2685 3229
2686 if (!(coro->flags & CF_RUNNING)) 3230 if (current != coro)
2687 { 3231 {
2688 PUTBACK; 3232 PUTBACK;
2689 save_perl (aTHX_ &temp); 3233 save_perl (aTHX_ current);
2690 load_perl (aTHX_ coro); 3234 load_perl (aTHX_ coro);
3235 SPAGAIN;
2691 } 3236 }
2692 3237
2693 {
2694 dSP;
2695 ENTER;
2696 SAVETMPS;
2697 PUTBACK;
2698 PUSHSTACK; 3238 PUSHSTACK;
3239
2699 PUSHMARK (SP); 3240 PUSHMARK (SP);
3241 PUTBACK;
2700 3242
2701 if (ix) 3243 if (ix)
2702 eval_sv (coderef, 0); 3244 eval_sv (coderef, 0);
2703 else 3245 else
2704 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3246 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2705 3247
2706 POPSTACK; 3248 POPSTACK;
2707 SPAGAIN; 3249 SPAGAIN;
2708 FREETMPS;
2709 LEAVE;
2710 PUTBACK;
2711 }
2712 3250
2713 if (!(coro->flags & CF_RUNNING)) 3251 if (current != coro)
2714 { 3252 {
3253 PUTBACK;
2715 save_perl (aTHX_ coro); 3254 save_perl (aTHX_ coro);
2716 load_perl (aTHX_ &temp); 3255 load_perl (aTHX_ current);
2717 SPAGAIN; 3256 SPAGAIN;
2718 } 3257 }
2719 } 3258 }
2720} 3259}
2721 3260
… …
2725 ALIAS: 3264 ALIAS:
2726 is_ready = CF_READY 3265 is_ready = CF_READY
2727 is_running = CF_RUNNING 3266 is_running = CF_RUNNING
2728 is_new = CF_NEW 3267 is_new = CF_NEW
2729 is_destroyed = CF_DESTROYED 3268 is_destroyed = CF_DESTROYED
3269 is_suspended = CF_SUSPENDED
2730 CODE: 3270 CODE:
2731 RETVAL = boolSV (coro->flags & ix); 3271 RETVAL = boolSV (coro->flags & ix);
2732 OUTPUT: 3272 OUTPUT:
2733 RETVAL 3273 RETVAL
2734 3274
… …
2738 CODE: 3278 CODE:
2739{ 3279{
2740 struct coro *current = SvSTATE_current; 3280 struct coro *current = SvSTATE_current;
2741 SV **throwp = self == current ? &CORO_THROW : &self->except; 3281 SV **throwp = self == current ? &CORO_THROW : &self->except;
2742 SvREFCNT_dec (*throwp); 3282 SvREFCNT_dec (*throwp);
3283 SvGETMAGIC (throw);
2743 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3284 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2744} 3285}
2745 3286
2746void 3287void
2747api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3288api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2750 3291
2751SV * 3292SV *
2752has_cctx (Coro::State coro) 3293has_cctx (Coro::State coro)
2753 PROTOTYPE: $ 3294 PROTOTYPE: $
2754 CODE: 3295 CODE:
2755 RETVAL = boolSV (!!coro->cctx); 3296 /* maybe manage the running flag differently */
3297 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2756 OUTPUT: 3298 OUTPUT:
2757 RETVAL 3299 RETVAL
2758 3300
2759int 3301int
2760is_traced (Coro::State coro) 3302is_traced (Coro::State coro)
… …
2780 3322
2781void 3323void
2782force_cctx () 3324force_cctx ()
2783 PROTOTYPE: 3325 PROTOTYPE:
2784 CODE: 3326 CODE:
2785 SvSTATE_current->cctx->idle_sp = 0; 3327 cctx_current->idle_sp = 0;
2786 3328
2787void 3329void
2788swap_defsv (Coro::State self) 3330swap_defsv (Coro::State self)
2789 PROTOTYPE: $ 3331 PROTOTYPE: $
2790 ALIAS: 3332 ALIAS:
… …
2798 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3340 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2799 3341
2800 SV *tmp = *src; *src = *dst; *dst = tmp; 3342 SV *tmp = *src; *src = *dst; *dst = tmp;
2801 } 3343 }
2802 3344
3345void
3346cancel (Coro::State self)
3347 CODE:
3348 coro_state_destroy (aTHX_ self);
3349 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3350
3351
3352SV *
3353enable_times (int enabled = enable_times)
3354 CODE:
3355{
3356 RETVAL = boolSV (enable_times);
3357
3358 if (enabled != enable_times)
3359 {
3360 enable_times = enabled;
3361
3362 coro_times_update ();
3363 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3364 }
3365}
3366 OUTPUT:
3367 RETVAL
3368
3369void
3370times (Coro::State self)
3371 PPCODE:
3372{
3373 struct coro *current = SvSTATE (coro_current);
3374
3375 if (expect_false (current == self))
3376 {
3377 coro_times_update ();
3378 coro_times_add (SvSTATE (coro_current));
3379 }
3380
3381 EXTEND (SP, 2);
3382 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3383 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3384
3385 if (expect_false (current == self))
3386 coro_times_sub (SvSTATE (coro_current));
3387}
3388
3389void
3390swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3391 CODE:
3392{
3393 struct coro *current = SvSTATE_current;
3394
3395 if (current == coro)
3396 SWAP_SVS (current);
3397
3398 if (!coro->swap_sv)
3399 coro->swap_sv = newAV ();
3400
3401 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3402 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3403
3404 if (current == coro)
3405 SWAP_SVS (current);
3406}
3407
2803 3408
2804MODULE = Coro::State PACKAGE = Coro 3409MODULE = Coro::State PACKAGE = Coro
2805 3410
2806BOOT: 3411BOOT:
2807{ 3412{
2808 int i;
2809
2810 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2811 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3413 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2812 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3414 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2813 3415 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3416 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2814 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3417 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2815 SvREADONLY_on (coro_current); 3418 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3419 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3420 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3421 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2816 3422
3423 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3424 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3425 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3426 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3427
2817 coro_stash = gv_stashpv ("Coro", TRUE); 3428 coro_stash = gv_stashpv ("Coro", TRUE);
2818 3429
2819 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3430 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2820 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3431 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2821 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3432 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2822 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3433 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2823 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3434 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2824 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3435 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2825
2826 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2827 coro_ready[i] = newAV ();
2828 3436
2829 { 3437 {
2830 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3438 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2831 3439
2832 coroapi.schedule = api_schedule; 3440 coroapi.schedule = api_schedule;
3441 coroapi.schedule_to = api_schedule_to;
2833 coroapi.cede = api_cede; 3442 coroapi.cede = api_cede;
2834 coroapi.cede_notself = api_cede_notself; 3443 coroapi.cede_notself = api_cede_notself;
2835 coroapi.ready = api_ready; 3444 coroapi.ready = api_ready;
2836 coroapi.is_ready = api_is_ready; 3445 coroapi.is_ready = api_is_ready;
2837 coroapi.nready = coro_nready; 3446 coroapi.nready = coro_nready;
… …
2841 sv_setiv (sv, (IV)&coroapi); 3450 sv_setiv (sv, (IV)&coroapi);
2842 SvREADONLY_on (sv); 3451 SvREADONLY_on (sv);
2843 } 3452 }
2844} 3453}
2845 3454
3455SV *
3456async (...)
3457 PROTOTYPE: &@
3458 CODE:
3459 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3460 api_ready (aTHX_ RETVAL);
3461 OUTPUT:
3462 RETVAL
3463
3464void
3465terminate (...)
3466 CODE:
3467 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3468
2846void 3469void
2847schedule (...) 3470schedule (...)
2848 CODE: 3471 CODE:
2849 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3472 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3473
3474void
3475schedule_to (...)
3476 CODE:
3477 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3478
3479void
3480cede_to (...)
3481 CODE:
3482 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2850 3483
2851void 3484void
2852cede (...) 3485cede (...)
2853 CODE: 3486 CODE:
2854 CORO_EXECUTE_SLF_XS (slf_init_cede); 3487 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2868void 3501void
2869_set_readyhook (SV *hook) 3502_set_readyhook (SV *hook)
2870 PROTOTYPE: $ 3503 PROTOTYPE: $
2871 CODE: 3504 CODE:
2872 SvREFCNT_dec (coro_readyhook); 3505 SvREFCNT_dec (coro_readyhook);
3506 SvGETMAGIC (hook);
3507 if (SvOK (hook))
3508 {
2873 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3509 coro_readyhook = newSVsv (hook);
3510 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3511 }
3512 else
3513 {
3514 coro_readyhook = 0;
3515 CORO_READYHOOK = 0;
3516 }
2874 3517
2875int 3518int
2876prio (Coro::State coro, int newprio = 0) 3519prio (Coro::State coro, int newprio = 0)
2877 PROTOTYPE: $;$ 3520 PROTOTYPE: $;$
2878 ALIAS: 3521 ALIAS:
… …
2884 if (items > 1) 3527 if (items > 1)
2885 { 3528 {
2886 if (ix) 3529 if (ix)
2887 newprio = coro->prio - newprio; 3530 newprio = coro->prio - newprio;
2888 3531
2889 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3532 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2890 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3533 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2891 3534
2892 coro->prio = newprio; 3535 coro->prio = newprio;
2893 } 3536 }
2894} 3537}
2895 OUTPUT: 3538 OUTPUT:
… …
2909 CODE: 3552 CODE:
2910 RETVAL = coro_nready; 3553 RETVAL = coro_nready;
2911 OUTPUT: 3554 OUTPUT:
2912 RETVAL 3555 RETVAL
2913 3556
2914# for async_pool speedup
2915void 3557void
2916_pool_1 (SV *cb) 3558suspend (Coro::State self)
3559 PROTOTYPE: $
2917 CODE: 3560 CODE:
2918{ 3561 self->flags |= CF_SUSPENDED;
2919 HV *hv = (HV *)SvRV (coro_current);
2920 struct coro *coro = SvSTATE_hv ((SV *)hv);
2921 AV *defav = GvAV (PL_defgv);
2922 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2923 AV *invoke_av;
2924 int i, len;
2925 3562
2926 if (!invoke) 3563void
3564resume (Coro::State self)
3565 PROTOTYPE: $
3566 CODE:
3567 self->flags &= ~CF_SUSPENDED;
3568
3569void
3570_pool_handler (...)
3571 CODE:
3572 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3573
3574void
3575async_pool (SV *cv, ...)
3576 PROTOTYPE: &@
3577 PPCODE:
3578{
3579 HV *hv = (HV *)av_pop (av_async_pool);
3580 AV *av = newAV ();
3581 SV *cb = ST (0);
3582 int i;
3583
3584 av_extend (av, items - 2);
3585 for (i = 1; i < items; ++i)
3586 av_push (av, SvREFCNT_inc_NN (ST (i)));
3587
3588 if ((SV *)hv == &PL_sv_undef)
2927 { 3589 {
2928 SV *old = PL_diehook; 3590 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2929 PL_diehook = 0; 3591 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2930 SvREFCNT_dec (old); 3592 SvREFCNT_dec (sv);
2931 croak ("\3async_pool terminate\2\n");
2932 } 3593 }
2933 3594
2934 SvREFCNT_dec (coro->saved_deffh);
2935 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2936
2937 hv_store (hv, "desc", sizeof ("desc") - 1,
2938 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2939
2940 invoke_av = (AV *)SvRV (invoke);
2941 len = av_len (invoke_av);
2942
2943 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2944
2945 if (len > 0)
2946 { 3595 {
2947 av_fill (defav, len - 1); 3596 struct coro *coro = SvSTATE_hv (hv);
2948 for (i = 0; i < len; ++i) 3597
2949 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3598 assert (!coro->invoke_cb);
3599 assert (!coro->invoke_av);
3600 coro->invoke_cb = SvREFCNT_inc (cb);
3601 coro->invoke_av = av;
2950 } 3602 }
2951}
2952 3603
2953void 3604 api_ready (aTHX_ (SV *)hv);
2954_pool_2 (SV *cb)
2955 CODE:
2956{
2957 HV *hv = (HV *)SvRV (coro_current);
2958 struct coro *coro = SvSTATE_hv ((SV *)hv);
2959 3605
2960 sv_setsv (cb, &PL_sv_undef); 3606 if (GIMME_V != G_VOID)
2961 3607 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2962 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3608 else
2963 coro->saved_deffh = 0;
2964
2965 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2966 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2967 {
2968 SV *old = PL_diehook;
2969 PL_diehook = 0;
2970 SvREFCNT_dec (old); 3609 SvREFCNT_dec (hv);
2971 croak ("\3async_pool terminate\2\n");
2972 }
2973
2974 av_clear (GvAV (PL_defgv));
2975 hv_store (hv, "desc", sizeof ("desc") - 1,
2976 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2977
2978 coro->prio = 0;
2979
2980 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2981 api_trace (aTHX_ coro_current, 0);
2982
2983 av_push (av_async_pool, newSVsv (coro_current));
2984} 3610}
2985 3611
2986SV * 3612SV *
2987rouse_cb () 3613rouse_cb ()
2988 PROTOTYPE: 3614 PROTOTYPE:
… …
2990 RETVAL = coro_new_rouse_cb (aTHX); 3616 RETVAL = coro_new_rouse_cb (aTHX);
2991 OUTPUT: 3617 OUTPUT:
2992 RETVAL 3618 RETVAL
2993 3619
2994void 3620void
2995rouse_wait (SV *cb = 0) 3621rouse_wait (...)
2996 PROTOTYPE: ;$ 3622 PROTOTYPE: ;$
2997 PPCODE: 3623 PPCODE:
2998 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3624 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2999 3625
3626void
3627on_enter (SV *block)
3628 ALIAS:
3629 on_leave = 1
3630 PROTOTYPE: &
3631 CODE:
3632{
3633 struct coro *coro = SvSTATE_current;
3634 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3635
3636 block = s_get_cv_croak (block);
3637
3638 if (!*avp)
3639 *avp = newAV ();
3640
3641 av_push (*avp, SvREFCNT_inc (block));
3642
3643 if (!ix)
3644 on_enterleave_call (aTHX_ block);
3645
3646 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3647 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3648 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3649}
3650
3000 3651
3001MODULE = Coro::State PACKAGE = PerlIO::cede 3652MODULE = Coro::State PACKAGE = PerlIO::cede
3002 3653
3003BOOT: 3654BOOT:
3004 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3655 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3007MODULE = Coro::State PACKAGE = Coro::Semaphore 3658MODULE = Coro::State PACKAGE = Coro::Semaphore
3008 3659
3009SV * 3660SV *
3010new (SV *klass, SV *count = 0) 3661new (SV *klass, SV *count = 0)
3011 CODE: 3662 CODE:
3663{
3664 int semcnt = 1;
3665
3666 if (count)
3667 {
3668 SvGETMAGIC (count);
3669
3670 if (SvOK (count))
3671 semcnt = SvIV (count);
3672 }
3673
3012 RETVAL = sv_bless ( 3674 RETVAL = sv_bless (
3013 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3675 coro_waitarray_new (aTHX_ semcnt),
3014 GvSTASH (CvGV (cv)) 3676 GvSTASH (CvGV (cv))
3015 ); 3677 );
3678}
3016 OUTPUT: 3679 OUTPUT:
3017 RETVAL 3680 RETVAL
3018 3681
3019# helper for Coro::Channel 3682# helper for Coro::Channel and others
3020SV * 3683SV *
3021_alloc (int count) 3684_alloc (int count)
3022 CODE: 3685 CODE:
3023 RETVAL = coro_waitarray_new (aTHX_ count); 3686 RETVAL = coro_waitarray_new (aTHX_ count);
3024 OUTPUT: 3687 OUTPUT:
… …
3037 adjust = 1 3700 adjust = 1
3038 CODE: 3701 CODE:
3039 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3702 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3040 3703
3041void 3704void
3042down (SV *self) 3705down (...)
3043 CODE: 3706 CODE:
3044 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3707 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3045 3708
3046void 3709void
3047wait (SV *self) 3710wait (...)
3048 CODE: 3711 CODE:
3049 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3712 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3050 3713
3051void 3714void
3052try (SV *self) 3715try (SV *self)
… …
3082 for (i = 1; i <= wcount; ++i) 3745 for (i = 1; i <= wcount; ++i)
3083 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3746 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3084 } 3747 }
3085} 3748}
3086 3749
3750MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3751
3752void
3753_may_delete (SV *sem, int count, int extra_refs)
3754 PPCODE:
3755{
3756 AV *av = (AV *)SvRV (sem);
3757
3758 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3759 && AvFILLp (av) == 0 /* no waiters, just count */
3760 && SvIV (AvARRAY (av)[0]) == count)
3761 XSRETURN_YES;
3762
3763 XSRETURN_NO;
3764}
3765
3087MODULE = Coro::State PACKAGE = Coro::Signal 3766MODULE = Coro::State PACKAGE = Coro::Signal
3088 3767
3089SV * 3768SV *
3090new (SV *klass) 3769new (SV *klass)
3091 CODE: 3770 CODE:
… …
3095 ); 3774 );
3096 OUTPUT: 3775 OUTPUT:
3097 RETVAL 3776 RETVAL
3098 3777
3099void 3778void
3100wait (SV *self) 3779wait (...)
3101 CODE: 3780 CODE:
3102 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3781 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3103 3782
3104void 3783void
3105broadcast (SV *self) 3784broadcast (SV *self)
… …
3162 3841
3163void 3842void
3164_register (char *target, char *proto, SV *req) 3843_register (char *target, char *proto, SV *req)
3165 CODE: 3844 CODE:
3166{ 3845{
3167 HV *st; 3846 SV *req_cv = s_get_cv_croak (req);
3168 GV *gvp;
3169 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3170 /* newXSproto doesn't return the CV on 5.8 */ 3847 /* newXSproto doesn't return the CV on 5.8 */
3171 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3848 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3172 sv_setpv ((SV *)slf_cv, proto); 3849 sv_setpv ((SV *)slf_cv, proto);
3173 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3850 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3174} 3851}
3175 3852
3853MODULE = Coro::State PACKAGE = Coro::Select
3854
3855void
3856patch_pp_sselect ()
3857 CODE:
3858 if (!coro_old_pp_sselect)
3859 {
3860 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3861 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3862 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3863 }
3864
3865void
3866unpatch_pp_sselect ()
3867 CODE:
3868 if (coro_old_pp_sselect)
3869 {
3870 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3871 coro_old_pp_sselect = 0;
3872 }
3873
3874

Diff Legend

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