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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.380 by root, Sun Sep 12 03:06:38 2010 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{
… …
449 else 530 else
450 { 531 {
451#if CORO_PREFER_PERL_FUNCTIONS 532#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 533 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 534 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (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 {
… …
574 /* we manually unroll here, as usually 2 slots is enough */ 746 /* we manually unroll here, as usually 2 slots is enough */
575 if (SLOT_COUNT >= 1) CXINC; 747 if (SLOT_COUNT >= 1) CXINC;
576 if (SLOT_COUNT >= 2) CXINC; 748 if (SLOT_COUNT >= 2) CXINC;
577 if (SLOT_COUNT >= 3) CXINC; 749 if (SLOT_COUNT >= 3) CXINC;
578 { 750 {
579 int i; 751 unsigned int i;
580 for (i = 3; i < SLOT_COUNT; ++i) 752 for (i = 3; i < SLOT_COUNT; ++i)
581 CXINC; 753 CXINC;
582 } 754 }
583 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 755 cxstack_ix -= SLOT_COUNT; /* undo allocation */
584 756
585 c->mainstack = PL_mainstack; 757 c->mainstack = PL_mainstack;
586 758
587 { 759 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 760 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 761
590 slot->defav = GvAV (PL_defgv); 762 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 763 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 764 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 765 slot->irsgv = GvSV (irsgv);
766 slot->hinthv = GvHV (PL_hintgv);
594 767
595 #define VAR(name,type) slot->name = PL_ ## name; 768 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 769 # include "state.h"
597 #undef VAR 770 #undef VAR
598 } 771 }
… …
603 * of perl.c:init_stacks, except that it uses less memory 776 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 777 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 778 * not usually need a lot of stackspace.
606 */ 779 */
607#if CORO_PREFER_PERL_FUNCTIONS 780#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 781# define coro_init_stacks(thx) init_stacks ()
609#else 782#else
610static void 783static void
611coro_init_stacks (pTHX) 784coro_init_stacks (pTHX)
612{ 785{
613 PL_curstackinfo = new_stackinfo(32, 8); 786 PL_curstackinfo = new_stackinfo(32, 8);
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 849#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 850 Safefree (PL_retstack);
678#endif 851#endif
679} 852}
680 853
854#define CORO_RSS \
855 rss += sizeof (SYM (curstackinfo)); \
856 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
857 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
858 rss += SYM (tmps_max) * sizeof (SV *); \
859 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
860 rss += SYM (scopestack_max) * sizeof (I32); \
861 rss += SYM (savestack_max) * sizeof (ANY);
862
681static size_t 863static size_t
682coro_rss (pTHX_ struct coro *coro) 864coro_rss (pTHX_ struct coro *coro)
683{ 865{
684 size_t rss = sizeof (*coro); 866 size_t rss = sizeof (*coro);
685 867
686 if (coro->mainstack) 868 if (coro->mainstack)
687 { 869 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 870 if (coro->flags & CF_RUNNING)
692 { 871 {
693 slot = &tmp_slot; 872 #define SYM(sym) PL_ ## sym
694 873 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 874 #undef SYM
698 } 875 }
699 else 876 else
700 slot = coro->slot;
701
702 if (slot)
703 { 877 {
704 rss += sizeof (slot->curstackinfo); 878 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 879 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 880 #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 } 881 }
716 } 882 }
717 883
718 return rss; 884 return rss;
719} 885}
… …
732#endif 898#endif
733 899
734/* 900/*
735 * This overrides the default magic get method of %SIG elements. 901 * 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 902 * 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 903 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 904 * 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 */ 905 */
743static int 906static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 907coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 908{
746 const char *s = MgPV_nolen_const (mg); 909 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 962 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 963
801 if (svp) 964 if (svp)
802 { 965 {
803 SV *old = *svp; 966 SV *old = *svp;
804 *svp = newSVsv (sv); 967 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 968 SvREFCNT_dec (old);
806 return 0; 969 return 0;
807 } 970 }
808 } 971 }
809 972
… …
821slf_check_nop (pTHX_ struct CoroSLF *frame) 984slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 985{
823 return 0; 986 return 0;
824} 987}
825 988
826static UNOP coro_setup_op; 989static int
990slf_check_repeat (pTHX_ struct CoroSLF *frame)
991{
992 return 1;
993}
994
995static UNOP init_perl_op;
827 996
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 997static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 998init_perl (pTHX_ struct coro *coro)
830{ 999{
831 /* 1000 /*
832 * emulate part of the perl startup here. 1001 * emulate part of the perl startup here.
833 */ 1002 */
834 coro_init_stacks (aTHX); 1003 coro_init_stacks (aTHX);
835 1004
836 PL_runops = RUNOPS_DEFAULT; 1005 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1006 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1007 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1008 PL_comppad = 0;
1009 PL_comppad_name = 0;
1010 PL_comppad_name_fill = 0;
1011 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1012 PL_curpm = 0;
841 PL_curpad = 0; 1013 PL_curpad = 0;
842 PL_localizing = 0; 1014 PL_localizing = 0;
843 PL_dirty = 0; 1015 PL_dirty = 0;
844 PL_restartop = 0; 1016 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1017#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1018 PL_parser = 0;
847#endif 1019#endif
1020 PL_hints = 0;
848 1021
849 /* recreate the die/warn hooks */ 1022 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1023 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); 1024 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1025
853 GvSV (PL_defgv) = newSV (0); 1026 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1027 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1028 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1029 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1030 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1031 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1032 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1033
860 { 1034 {
861 dSP; 1035 dSP;
862 UNOP myop; 1036 UNOP myop;
863 1037
864 Zero (&myop, 1, UNOP); 1038 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1039 myop.op_next = Nullop;
1040 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1041 myop.op_flags = OPf_WANT_VOID;
867 1042
868 PUSHMARK (SP); 1043 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1044 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1045 PUTBACK;
871 PL_op = (OP *)&myop; 1046 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1047 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1048 }
875 1049
876 /* this newly created coroutine might be run on an existing cctx which most 1050 /* 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. 1051 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1052 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1053 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 */ 1054 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1055
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1056 /* 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; 1057 init_perl_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1058 init_perl_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1059 init_perl_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1060 /* no flags etc. required, as an init function won't be called */
887 1061
888 PL_op = (OP *)&coro_setup_op; 1062 PL_op = (OP *)&init_perl_op;
889 1063
890 /* copy throw, in case it was set before coro_setup */ 1064 /* copy throw, in case it was set before init_perl */
891 CORO_THROW = coro->except; 1065 CORO_THROW = coro->except;
892}
893 1066
1067 SWAP_SVS (coro);
1068
1069 if (expect_false (enable_times))
1070 {
1071 coro_times_update ();
1072 coro_times_sub (coro);
1073 }
1074}
1075
894static void 1076static void
895coro_destruct (pTHX_ struct coro *coro) 1077coro_unwind_stacks (pTHX)
896{ 1078{
897 if (!IN_DESTRUCT) 1079 if (!IN_DESTRUCT)
898 { 1080 {
899 /* restore all saved variables and stuff */ 1081 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1082 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1090 POPSTACK_TO (PL_mainstack);
909 1091
910 /* unwind main stack */ 1092 /* unwind main stack */
911 dounwind (-1); 1093 dounwind (-1);
912 } 1094 }
1095}
913 1096
914 SvREFCNT_dec (GvSV (PL_defgv)); 1097static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1098destroy_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1099{
917 SvREFCNT_dec (PL_defoutgv); 1100 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1101
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1102 {
924 SvREFCNT_dec (CORO_THROW); 1103 struct coro *current = SvSTATE_current;
1104
1105 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1106
1107 save_perl (aTHX_ current);
1108 load_perl (aTHX_ coro);
1109
1110 coro_unwind_stacks (aTHX);
1111 coro_destruct_stacks (aTHX);
1112
1113 /* restore swapped sv's */
1114 SWAP_SVS (coro);
1115
1116 // now save some sv's to be free'd later
1117 svf [0] = GvSV (PL_defgv);
1118 svf [1] = (SV *)GvAV (PL_defgv);
1119 svf [2] = GvSV (PL_errgv);
1120 svf [3] = (SV *)PL_defoutgv;
1121 svf [4] = PL_rs;
1122 svf [5] = GvSV (irsgv);
1123 svf [6] = (SV *)GvHV (PL_hintgv);
1124 svf [7] = PL_diehook;
1125 svf [8] = PL_warnhook;
1126 assert (9 == sizeof (svf) / sizeof (*svf));
1127
1128 load_perl (aTHX_ current);
1129 }
1130
1131 {
1132 unsigned int i;
1133
1134 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1135 SvREFCNT_dec (svf [i]);
1136
925 SvREFCNT_dec (coro->saved_deffh); 1137 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1138 SvREFCNT_dec (coro->rouse_cb);
927 1139 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1140 SvREFCNT_dec (coro->invoke_av);
1141 }
929} 1142}
930 1143
931INLINE void 1144INLINE void
932free_coro_mortal (pTHX) 1145free_coro_mortal (pTHX)
933{ 1146{
… …
941static int 1154static int
942runops_trace (pTHX) 1155runops_trace (pTHX)
943{ 1156{
944 COP *oldcop = 0; 1157 COP *oldcop = 0;
945 int oldcxix = -2; 1158 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1159
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1160 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1161 {
951 PERL_ASYNC_CHECK (); 1162 PERL_ASYNC_CHECK ();
952 1163
953 if (cctx->flags & CC_TRACE_ALL) 1164 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1165 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1166 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1167 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1168 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1169 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1170 AV *av = newAV (); /* return values */
960 SV **cb; 1171 SV **cb;
… …
997 1208
998 if (PL_curcop != &PL_compiling) 1209 if (PL_curcop != &PL_compiling)
999 { 1210 {
1000 SV **cb; 1211 SV **cb;
1001 1212
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1213 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1214 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1215 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1216
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1217 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1218 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1219 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1220 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1221 SV *fullname = sv_2mortal (newSV (0));
1012 1222
1013 if (isGV (gv)) 1223 if (isGV (gv))
… …
1018 SAVETMPS; 1228 SAVETMPS;
1019 EXTEND (SP, 3); 1229 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1230 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1231 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1232 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1233 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1234 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1235 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); 1236 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1237 SPAGAIN;
1028 FREETMPS; 1238 FREETMPS;
… …
1031 } 1241 }
1032 1242
1033 oldcxix = cxstack_ix; 1243 oldcxix = cxstack_ix;
1034 } 1244 }
1035 1245
1036 if (cctx->flags & CC_TRACE_LINE) 1246 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1247 {
1038 dSP; 1248 dSP;
1039 1249
1040 PL_runops = RUNOPS_DEFAULT; 1250 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1251 ENTER;
… …
1060 1270
1061 TAINT_NOT; 1271 TAINT_NOT;
1062 return 0; 1272 return 0;
1063} 1273}
1064 1274
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1275static struct CoroSLF cctx_ssl_frame;
1067 1276
1068static void 1277static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1278slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1279{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1280 ta->prev = 0;
1073} 1281}
1074 1282
1075static int 1283static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1284slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1285{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1288 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1289}
1082 1290
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1291/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1292static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1293cctx_prepare (pTHX)
1086{ 1294{
1087 PL_top_env = &PL_start_env; 1295 PL_top_env = &PL_start_env;
1088 1296
1089 if (cctx->flags & CC_TRACE) 1297 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1298 PL_runops = runops_trace;
1091 1299
1092 /* we already must be executing an SLF op, there is no other valid way 1300 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1301 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1302 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1303 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1304
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1305 /* 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; 1306 cctx_ssl_frame = slf_frame;
1100 1307
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1308 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1309 slf_frame.check = slf_check_set_stacklevel;
1103} 1310}
… …
1126 /* normally we would need to skip the entersub here */ 1333 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1334 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1335 /* PL_nop = PL_nop->op_next */
1129 1336
1130 /* inject a fake subroutine call to cctx_init */ 1337 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1338 cctx_prepare (aTHX);
1132 1339
1133 /* cctx_run is the alternative tail of transfer() */ 1340 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1341 transfer_tail (aTHX);
1135 1342
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1343 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1344 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1345 perl_run (PL_curinterp);
1346 /*
1347 * Unfortunately, there is no way to get at the return values of the
1348 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1349 * runtime errors here, as this is just a random interpreter, not a thread.
1350 */
1139 1351
1140 /* 1352 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1353 * 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) 1354 * 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 1355 * 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" 1356 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1357 * coroutine as Coro has no such concept.
1358 * This actually isn't valid with the pthread backend, but OSes requiring
1359 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1360 */
1147 PL_top_env = main_top_env; 1361 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1362 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1363 }
1150} 1364}
… …
1227cctx_destroy (coro_cctx *cctx) 1441cctx_destroy (coro_cctx *cctx)
1228{ 1442{
1229 if (!cctx) 1443 if (!cctx)
1230 return; 1444 return;
1231 1445
1446 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1447
1232 --cctx_count; 1448 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1449 coro_destroy (&cctx->cctx);
1234 1450
1235 /* coro_transfer creates new, empty cctx's */ 1451 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1452 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1515 /* TODO: throwing up here is considered harmful */
1300 1516
1301 if (expect_true (prev != next)) 1517 if (expect_true (prev != next))
1302 { 1518 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1519 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,"); 1520 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1521
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)) 1522 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,"); 1523 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1524
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1525#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1526 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,"); 1527 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1528#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1534transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1535{
1323 dSTACKLEVEL; 1536 dSTACKLEVEL;
1324 1537
1325 /* sometimes transfer is only called to set idle_sp */ 1538 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1539 if (expect_false (!prev))
1327 { 1540 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1541 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1542 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1543 }
1331 else if (expect_true (prev != next)) 1544 else if (expect_true (prev != next))
1332 { 1545 {
1333 coro_cctx *prev__cctx; 1546 coro_cctx *cctx_prev;
1334 1547
1335 if (expect_false (prev->flags & CF_NEW)) 1548 if (expect_false (prev->flags & CF_NEW))
1336 { 1549 {
1337 /* create a new empty/source context */ 1550 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1551 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1552 prev->flags |= CF_RUNNING;
1341 } 1553 }
1342 1554
1343 prev->flags &= ~CF_RUNNING; 1555 prev->flags &= ~CF_RUNNING;
… …
1349 if (expect_false (next->flags & CF_NEW)) 1561 if (expect_false (next->flags & CF_NEW))
1350 { 1562 {
1351 /* need to start coroutine */ 1563 /* need to start coroutine */
1352 next->flags &= ~CF_NEW; 1564 next->flags &= ~CF_NEW;
1353 /* setup coroutine call */ 1565 /* setup coroutine call */
1354 coro_setup (aTHX_ next); 1566 init_perl (aTHX_ next);
1355 } 1567 }
1356 else 1568 else
1357 load_perl (aTHX_ next); 1569 load_perl (aTHX_ next);
1358 1570
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1571 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1572 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1573 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1574 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1575 && !force_cctx
1366 )) 1576 ))
1367 { 1577 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1578 /* 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)); 1579 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1580
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 */ 1581 /* 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 */ 1582 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1583 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1584 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1585 next->cctx = cctx_get (aTHX);
1378 1586
1379 cctx_put (prev__cctx); 1587 cctx_put (cctx_current);
1380 } 1588 }
1589 else
1590 prev->cctx = cctx_current;
1381 1591
1382 ++next->usecount; 1592 ++next->usecount;
1383 1593
1384 if (expect_true (!next->cctx)) 1594 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1595 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1596
1387 if (expect_false (prev__cctx != next->cctx)) 1597 next->cctx = 0;
1598
1599 if (expect_false (cctx_prev != cctx_current))
1388 { 1600 {
1389 prev__cctx->top_env = PL_top_env; 1601 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1602 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1603 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1604 }
1393 1605
1394 transfer_tail (aTHX); 1606 transfer_tail (aTHX);
1395 } 1607 }
1396} 1608}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1616coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1617{
1406 if (coro->flags & CF_DESTROYED) 1618 if (coro->flags & CF_DESTROYED)
1407 return 0; 1619 return 0;
1408 1620
1409 if (coro->on_destroy) 1621 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1622 coro->on_destroy (aTHX_ coro);
1411 1623
1412 coro->flags |= CF_DESTROYED; 1624 coro->flags |= CF_DESTROYED;
1413 1625
1414 if (coro->flags & CF_READY) 1626 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1630 --coro_nready;
1419 } 1631 }
1420 else 1632 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1633 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1634
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1635 if (coro->mainstack
1424 { 1636 && coro->mainstack != main_mainstack
1425 struct coro temp; 1637 && coro->slot
1426 1638 && !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); 1639 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 1640
1442 if (coro->next) coro->next->prev = coro->prev; 1641 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1642 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1643 if (coro == coro_first) coro_first = coro->next;
1644
1645 cctx_destroy (coro->cctx);
1646 SvREFCNT_dec (coro->startcv);
1647 SvREFCNT_dec (coro->args);
1648 SvREFCNT_dec (coro->swap_sv);
1649 SvREFCNT_dec (CORO_THROW);
1445 1650
1446 return 1; 1651 return 1;
1447} 1652}
1448 1653
1449static int 1654static int
… …
1499 1704
1500 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1705 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1501 TRANSFER (ta, 1); 1706 TRANSFER (ta, 1);
1502} 1707}
1503 1708
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 ********************************************************************/ 1709/** Coro ********************************************************************/
1528 1710
1529INLINE void 1711INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1712coro_enq (pTHX_ struct coro *coro)
1531{ 1713{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1714 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1715
1535INLINE SV * 1716 SvREFCNT_inc_NN (coro->hv);
1717
1718 coro->next_ready = 0;
1719 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1720 ready [1] = coro;
1721}
1722
1723INLINE struct coro *
1536coro_deq (pTHX) 1724coro_deq (pTHX)
1537{ 1725{
1538 int prio; 1726 int prio;
1539 1727
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1728 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1729 {
1542 return av_shift (coro_ready [prio]); 1730 struct coro **ready = coro_ready [prio];
1731
1732 if (ready [0])
1733 {
1734 struct coro *coro = ready [0];
1735 ready [0] = coro->next_ready;
1736 return coro;
1737 }
1738 }
1543 1739
1544 return 0; 1740 return 0;
1741}
1742
1743static void
1744invoke_sv_ready_hook_helper (void)
1745{
1746 dTHX;
1747 dSP;
1748
1749 ENTER;
1750 SAVETMPS;
1751
1752 PUSHMARK (SP);
1753 PUTBACK;
1754 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1755
1756 FREETMPS;
1757 LEAVE;
1545} 1758}
1546 1759
1547static int 1760static int
1548api_ready (pTHX_ SV *coro_sv) 1761api_ready (pTHX_ SV *coro_sv)
1549{ 1762{
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); 1763 struct coro *coro = SvSTATE (coro_sv);
1558 1764
1559 if (coro->flags & CF_READY) 1765 if (coro->flags & CF_READY)
1560 return 0; 1766 return 0;
1561 1767
1562 coro->flags |= CF_READY; 1768 coro->flags |= CF_READY;
1563 1769
1564 sv_hook = coro_nready ? 0 : coro_readyhook;
1565 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1566
1567 coro_enq (aTHX_ coro); 1770 coro_enq (aTHX_ coro);
1568 ++coro_nready;
1569 1771
1570 if (sv_hook) 1772 if (!coro_nready++)
1571 { 1773 if (coroapi.readyhook)
1572 dSP; 1774 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 1775
1588 return 1; 1776 return 1;
1589} 1777}
1590 1778
1591static int 1779static int
1592api_is_ready (pTHX_ SV *coro_sv) 1780api_is_ready (pTHX_ SV *coro_sv)
1593{ 1781{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1782 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1783}
1596 1784
1785/* expects to own a reference to next->hv */
1597INLINE void 1786INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1787prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1788{
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); 1789 SV *prev_sv = SvRV (coro_current);
1790
1639 ta->prev = SvSTATE_hv (prev_sv); 1791 ta->prev = SvSTATE_hv (prev_sv);
1792 ta->next = next;
1793
1640 TRANSFER_CHECK (*ta); 1794 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1795
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1796 SvRV_set (coro_current, (SV *)next->hv);
1644 1797
1645 free_coro_mortal (aTHX); 1798 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1799 coro_mortal = prev_sv;
1647} 1800}
1648 1801
1802static void
1803prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1804{
1805 for (;;)
1806 {
1807 struct coro *next = coro_deq (aTHX);
1808
1809 if (expect_true (next))
1810 {
1811 /* cannot transfer to destroyed coros, skip and look for next */
1812 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1813 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1814 else
1815 {
1816 next->flags &= ~CF_READY;
1817 --coro_nready;
1818
1819 prepare_schedule_to (aTHX_ ta, next);
1820 break;
1821 }
1822 }
1823 else
1824 {
1825 /* nothing to schedule: call the idle handler */
1826 if (SvROK (sv_idle)
1827 && SvOBJECT (SvRV (sv_idle)))
1828 {
1829 if (SvRV (sv_idle) == SvRV (coro_current))
1830 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1831
1832 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1833 api_ready (aTHX_ SvRV (sv_idle));
1834 --coro_nready;
1835 }
1836 else
1837 {
1838 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1839 dSP;
1840
1841 ENTER;
1842 SAVETMPS;
1843
1844 PUSHMARK (SP);
1845 PUTBACK;
1846 call_sv (sv_idle, G_VOID | G_DISCARD);
1847
1848 FREETMPS;
1849 LEAVE;
1850 }
1851 }
1852 }
1853}
1854
1649INLINE void 1855INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1856prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1857{
1652 api_ready (aTHX_ coro_current); 1858 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1859 prepare_schedule (aTHX_ ta);
… …
1672{ 1878{
1673 struct coro_transfer_args ta; 1879 struct coro_transfer_args ta;
1674 1880
1675 prepare_schedule (aTHX_ &ta); 1881 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1882 TRANSFER (ta, 1);
1883}
1884
1885static void
1886api_schedule_to (pTHX_ SV *coro_sv)
1887{
1888 struct coro_transfer_args ta;
1889 struct coro *next = SvSTATE (coro_sv);
1890
1891 SvREFCNT_inc_NN (coro_sv);
1892 prepare_schedule_to (aTHX_ &ta, next);
1677} 1893}
1678 1894
1679static int 1895static int
1680api_cede (pTHX) 1896api_cede (pTHX)
1681{ 1897{
… …
1710static void 1926static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1927api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1928{
1713 struct coro *coro = SvSTATE (coro_sv); 1929 struct coro *coro = SvSTATE (coro_sv);
1714 1930
1931 if (coro->flags & CF_RUNNING)
1932 croak ("cannot enable tracing on a running coroutine, caught");
1933
1715 if (flags & CC_TRACE) 1934 if (flags & CC_TRACE)
1716 { 1935 {
1717 if (!coro->cctx) 1936 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1937 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1938 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1939 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1940
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1941 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1942 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1943 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1944 {
… …
1730 else 1949 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1950 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1951 }
1733} 1952}
1734 1953
1954static void
1955coro_call_on_destroy (pTHX_ struct coro *coro)
1956{
1957 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1958 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1959
1960 if (on_destroyp)
1961 {
1962 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1963
1964 while (AvFILLp (on_destroy) >= 0)
1965 {
1966 dSP; /* don't disturb outer sp */
1967 SV *cb = av_pop (on_destroy);
1968
1969 PUSHMARK (SP);
1970
1971 if (statusp)
1972 {
1973 int i;
1974 AV *status = (AV *)SvRV (*statusp);
1975 EXTEND (SP, AvFILLp (status) + 1);
1976
1977 for (i = 0; i <= AvFILLp (status); ++i)
1978 PUSHs (AvARRAY (status)[i]);
1979 }
1980
1981 PUTBACK;
1982 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1983 }
1984 }
1985}
1986
1987static void
1988slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1989{
1990 int i;
1991 HV *hv = (HV *)SvRV (coro_current);
1992 AV *av = newAV ();
1993
1994 /* items are actually not so common, so optimise for this case */
1995 if (items)
1996 {
1997 av_extend (av, items - 1);
1998
1999 for (i = 0; i < items; ++i)
2000 av_push (av, SvREFCNT_inc_NN (arg [i]));
2001 }
2002
2003 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2004
2005 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2006 api_ready (aTHX_ sv_manager);
2007
2008 frame->prepare = prepare_schedule;
2009 frame->check = slf_check_repeat;
2010
2011 /* as a minor optimisation, we could unwind all stacks here */
2012 /* but that puts extra pressure on pp_slf, and is not worth much */
2013 /*coro_unwind_stacks (aTHX);*/
2014}
2015
2016/*****************************************************************************/
2017/* async pool handler */
2018
2019static int
2020slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2021{
2022 HV *hv = (HV *)SvRV (coro_current);
2023 struct coro *coro = (struct coro *)frame->data;
2024
2025 if (!coro->invoke_cb)
2026 return 1; /* loop till we have invoke */
2027 else
2028 {
2029 hv_store (hv, "desc", sizeof ("desc") - 1,
2030 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2031
2032 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2033
2034 {
2035 dSP;
2036 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2037 PUTBACK;
2038 }
2039
2040 SvREFCNT_dec (GvAV (PL_defgv));
2041 GvAV (PL_defgv) = coro->invoke_av;
2042 coro->invoke_av = 0;
2043
2044 return 0;
2045 }
2046}
2047
2048static void
2049slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2050{
2051 HV *hv = (HV *)SvRV (coro_current);
2052 struct coro *coro = SvSTATE_hv ((SV *)hv);
2053
2054 if (expect_true (coro->saved_deffh))
2055 {
2056 /* subsequent iteration */
2057 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2058 coro->saved_deffh = 0;
2059
2060 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2061 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2062 {
2063 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2064 coro->invoke_av = newAV ();
2065
2066 frame->prepare = prepare_nop;
2067 }
2068 else
2069 {
2070 av_clear (GvAV (PL_defgv));
2071 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2072
2073 coro->prio = 0;
2074
2075 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2076 api_trace (aTHX_ coro_current, 0);
2077
2078 frame->prepare = prepare_schedule;
2079 av_push (av_async_pool, SvREFCNT_inc (hv));
2080 }
2081 }
2082 else
2083 {
2084 /* first iteration, simply fall through */
2085 frame->prepare = prepare_nop;
2086 }
2087
2088 frame->check = slf_check_pool_handler;
2089 frame->data = (void *)coro;
2090}
2091
1735/*****************************************************************************/ 2092/*****************************************************************************/
1736/* rouse callback */ 2093/* rouse callback */
1737 2094
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2095#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2096
1740static void 2097static void
1741coro_rouse_callback (pTHX_ CV *cv) 2098coro_rouse_callback (pTHX_ CV *cv)
1742{ 2099{
1743 dXSARGS; 2100 dXSARGS;
1744 SV *data = (SV *)GENSUB_ARG; 2101 SV *data = (SV *)S_GENSUB_ARG;
1745 2102
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2103 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2104 {
1748 /* first call, set args */ 2105 /* first call, set args */
1749 int i; 2106 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2107 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2108
1753 SvRV_set (data, (SV *)av); 2109 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2110
1757 /* better take a full copy of the arguments */ 2111 /* better take a full copy of the arguments */
1758 while (items--) 2112 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2113 av_store (av, items, newSVsv (ST (items)));
2114
2115 api_ready (aTHX_ coro);
2116 SvREFCNT_dec (coro);
1760 } 2117 }
1761 2118
1762 XSRETURN_EMPTY; 2119 XSRETURN_EMPTY;
1763} 2120}
1764 2121
… …
1781 2138
1782 EXTEND (SP, AvFILLp (av) + 1); 2139 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2140 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2141 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2142
1786 /* we have stolen the elements, so ste length to zero and free */ 2143 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2144 AvFILLp (av) = -1;
1788 av_undef (av); 2145 av_undef (av);
1789 2146
1790 PUTBACK; 2147 PUTBACK;
1791 } 2148 }
… …
1815 || SvTYPE (SvRV (cb)) != SVt_PVCV 2172 || SvTYPE (SvRV (cb)) != SVt_PVCV
1816 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2173 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1817 croak ("Coro::rouse_wait called with illegal callback argument,"); 2174 croak ("Coro::rouse_wait called with illegal callback argument,");
1818 2175
1819 { 2176 {
1820 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2177 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1821 SV *data = (SV *)GENSUB_ARG; 2178 SV *data = (SV *)S_GENSUB_ARG;
1822 2179
1823 frame->data = (void *)data; 2180 frame->data = (void *)data;
1824 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2181 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1825 frame->check = slf_check_rouse_wait; 2182 frame->check = slf_check_rouse_wait;
1826 } 2183 }
… …
1830coro_new_rouse_cb (pTHX) 2187coro_new_rouse_cb (pTHX)
1831{ 2188{
1832 HV *hv = (HV *)SvRV (coro_current); 2189 HV *hv = (HV *)SvRV (coro_current);
1833 struct coro *coro = SvSTATE_hv (hv); 2190 struct coro *coro = SvSTATE_hv (hv);
1834 SV *data = newRV_inc ((SV *)hv); 2191 SV *data = newRV_inc ((SV *)hv);
1835 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2192 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1836 2193
1837 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2194 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1838 SvREFCNT_dec (data); /* magicext increases the refcount */ 2195 SvREFCNT_dec (data); /* magicext increases the refcount */
1839 2196
1840 SvREFCNT_dec (coro->rouse_cb); 2197 SvREFCNT_dec (coro->rouse_cb);
… …
1895static void 2252static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2253slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2254{
1898 frame->prepare = prepare_schedule; 2255 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2256 frame->check = slf_check_nop;
2257}
2258
2259static void
2260slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2261{
2262 struct coro *next = (struct coro *)slf_frame.data;
2263
2264 SvREFCNT_inc_NN (next->hv);
2265 prepare_schedule_to (aTHX_ ta, next);
2266}
2267
2268static void
2269slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2270{
2271 if (!items)
2272 croak ("Coro::schedule_to expects a coroutine argument, caught");
2273
2274 frame->data = (void *)SvSTATE (arg [0]);
2275 frame->prepare = slf_prepare_schedule_to;
2276 frame->check = slf_check_nop;
2277}
2278
2279static void
2280slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2281{
2282 api_ready (aTHX_ SvRV (coro_current));
2283
2284 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2285}
1901 2286
1902static void 2287static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2288slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2289{
… …
2037 if (PL_op->op_flags & OPf_STACKED) 2422 if (PL_op->op_flags & OPf_STACKED)
2038 { 2423 {
2039 if (items > slf_arga) 2424 if (items > slf_arga)
2040 { 2425 {
2041 slf_arga = items; 2426 slf_arga = items;
2042 free (slf_argv); 2427 Safefree (slf_argv);
2043 slf_argv = malloc (slf_arga * sizeof (SV *)); 2428 New (0, slf_argv, slf_arga, SV *);
2044 } 2429 }
2045 2430
2046 slf_argc = items; 2431 slf_argc = items;
2047 2432
2048 for (i = 0; i < items; ++i) 2433 for (i = 0; i < items; ++i)
… …
2050 } 2435 }
2051 else 2436 else
2052 slf_argc = 0; 2437 slf_argc = 0;
2053 2438
2054 PL_op->op_ppaddr = pp_slf; 2439 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2440 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2441
2057 PL_op = (OP *)&slf_restore; 2442 PL_op = (OP *)&slf_restore;
2443}
2444
2445/*****************************************************************************/
2446/* dynamic wind */
2447
2448static void
2449on_enterleave_call (pTHX_ SV *cb)
2450{
2451 dSP;
2452
2453 PUSHSTACK;
2454
2455 PUSHMARK (SP);
2456 PUTBACK;
2457 call_sv (cb, G_VOID | G_DISCARD);
2458 SPAGAIN;
2459
2460 POPSTACK;
2461}
2462
2463static SV *
2464coro_avp_pop_and_free (pTHX_ AV **avp)
2465{
2466 AV *av = *avp;
2467 SV *res = av_pop (av);
2468
2469 if (AvFILLp (av) < 0)
2470 {
2471 *avp = 0;
2472 SvREFCNT_dec (av);
2473 }
2474
2475 return res;
2476}
2477
2478static void
2479coro_pop_on_enter (pTHX_ void *coro)
2480{
2481 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2482 SvREFCNT_dec (cb);
2483}
2484
2485static void
2486coro_pop_on_leave (pTHX_ void *coro)
2487{
2488 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2489 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2490}
2059 2491
2060/*****************************************************************************/ 2492/*****************************************************************************/
2061/* PerlIO::cede */ 2493/* PerlIO::cede */
2062 2494
… …
2136/* Coro::Semaphore & Coro::Signal */ 2568/* Coro::Semaphore & Coro::Signal */
2137 2569
2138static SV * 2570static SV *
2139coro_waitarray_new (pTHX_ int count) 2571coro_waitarray_new (pTHX_ int count)
2140{ 2572{
2141 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2573 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2142 AV *av = newAV (); 2574 AV *av = newAV ();
2143 SV **ary; 2575 SV **ary;
2144 2576
2145 /* unfortunately, building manually saves memory */ 2577 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2578 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2579 AvALLOC (av) = ary;
2580#if PERL_VERSION_ATLEAST (5,10,0)
2148 AvARRAY (av) = ary; 2581 AvARRAY (av) = ary;
2582#else
2583 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2584 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2585 SvPVX ((SV *)av) = (char *)ary;
2586#endif
2149 AvMAX (av) = 1; 2587 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2588 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2589 ary [0] = newSViv (count);
2152 2590
2153 return newRV_noinc ((SV *)av); 2591 return newRV_noinc ((SV *)av);
… …
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2611 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2612 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2613 cb = av_shift (av);
2176 2614
2177 if (SvOBJECT (cb)) 2615 if (SvOBJECT (cb))
2616 {
2178 api_ready (aTHX_ cb); 2617 api_ready (aTHX_ cb);
2179 else 2618 --count;
2180 croak ("callbacks not yet supported"); 2619 }
2620 else if (SvTYPE (cb) == SVt_PVCV)
2621 {
2622 dSP;
2623 PUSHMARK (SP);
2624 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2625 PUTBACK;
2626 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2627 }
2181 2628
2182 SvREFCNT_dec (cb); 2629 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2630 }
2186} 2631}
2187 2632
2188static void 2633static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2634coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2271} 2716}
2272 2717
2273static void 2718static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2719slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2720{
2721 if (items >= 2)
2722 {
2723 /* callback form */
2724 AV *av = (AV *)SvRV (arg [0]);
2725 SV *cb_cv = s_get_cv_croak (arg [1]);
2726
2727 av_push (av, SvREFCNT_inc_NN (cb_cv));
2728
2729 if (SvIVX (AvARRAY (av)[0]) > 0)
2730 coro_semaphore_adjust (aTHX_ av, 0);
2731
2732 frame->prepare = prepare_nop;
2733 frame->check = slf_check_nop;
2734 }
2735 else
2736 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2737 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2738 frame->check = slf_check_semaphore_wait;
2739 }
2278} 2740}
2279 2741
2280/* signal */ 2742/* signal */
2281 2743
2282static void 2744static void
… …
2294 AvARRAY (av)[0] = AvARRAY (av)[1]; 2756 AvARRAY (av)[0] = AvARRAY (av)[1];
2295 AvARRAY (av)[1] = cb; 2757 AvARRAY (av)[1] = cb;
2296 2758
2297 cb = av_shift (av); 2759 cb = av_shift (av);
2298 2760
2761 if (SvTYPE (cb) == SVt_PVCV)
2762 {
2763 dSP;
2764 PUSHMARK (SP);
2765 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2766 PUTBACK;
2767 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2768 }
2769 else
2770 {
2299 api_ready (aTHX_ cb); 2771 api_ready (aTHX_ cb);
2300 sv_setiv (cb, 0); /* signal waiter */ 2772 sv_setiv (cb, 0); /* signal waiter */
2773 }
2774
2301 SvREFCNT_dec (cb); 2775 SvREFCNT_dec (cb);
2302 2776
2303 --count; 2777 --count;
2304 } 2778 }
2305} 2779}
… …
2314static void 2788static void
2315slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2789slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{ 2790{
2317 AV *av = (AV *)SvRV (arg [0]); 2791 AV *av = (AV *)SvRV (arg [0]);
2318 2792
2793 if (items >= 2)
2794 {
2795 SV *cb_cv = s_get_cv_croak (arg [1]);
2796 av_push (av, SvREFCNT_inc_NN (cb_cv));
2797
2319 if (SvIVX (AvARRAY (av)[0])) 2798 if (SvIVX (AvARRAY (av)[0]))
2799 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2800
2801 frame->prepare = prepare_nop;
2802 frame->check = slf_check_nop;
2803 }
2804 else if (SvIVX (AvARRAY (av)[0]))
2320 { 2805 {
2321 SvIVX (AvARRAY (av)[0]) = 0; 2806 SvIVX (AvARRAY (av)[0]) = 0;
2322 frame->prepare = prepare_nop; 2807 frame->prepare = prepare_nop;
2323 frame->check = slf_check_nop; 2808 frame->check = slf_check_nop;
2324 } 2809 }
2325 else 2810 else
2326 { 2811 {
2327 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2812 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2328 2813
2329 av_push (av, waiter); 2814 av_push (av, waiter);
2330 2815
2331 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2816 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2332 frame->prepare = prepare_schedule; 2817 frame->prepare = prepare_schedule;
… …
2350 2835
2351static void 2836static void
2352coro_aio_callback (pTHX_ CV *cv) 2837coro_aio_callback (pTHX_ CV *cv)
2353{ 2838{
2354 dXSARGS; 2839 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2840 AV *state = (AV *)S_GENSUB_ARG;
2356 SV *coro = av_pop (state); 2841 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2842 SV *data_sv = newSV (sizeof (struct io_state));
2358 2843
2359 av_extend (state, items); 2844 av_extend (state, items - 1);
2360 2845
2361 sv_upgrade (data_sv, SVt_PV); 2846 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2847 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2848 SvPOK_only (data_sv);
2364 2849
… …
2474 2959
2475 for (i = 0; i < items; ++i) 2960 for (i = 0; i < items; ++i)
2476 PUSHs (arg [i]); 2961 PUSHs (arg [i]);
2477 2962
2478 /* now push the callback closure */ 2963 /* now push the callback closure */
2479 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2964 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2480 2965
2481 /* now call the AIO function - we assume our request is uncancelable */ 2966 /* now call the AIO function - we assume our request is uncancelable */
2482 PUTBACK; 2967 PUTBACK;
2483 call_sv ((SV *)req, G_VOID | G_DISCARD); 2968 call_sv ((SV *)req, G_VOID | G_DISCARD);
2484 } 2969 }
2485 2970
2486 /* now that the requets is going, we loop toll we have a result */ 2971 /* now that the request is going, we loop till we have a result */
2487 frame->data = (void *)state; 2972 frame->data = (void *)state;
2488 frame->prepare = prepare_schedule; 2973 frame->prepare = prepare_schedule;
2489 frame->check = slf_check_aio_req; 2974 frame->check = slf_check_aio_req;
2490} 2975}
2491 2976
… …
2498 2983
2499 XSRETURN_EMPTY; 2984 XSRETURN_EMPTY;
2500} 2985}
2501 2986
2502/*****************************************************************************/ 2987/*****************************************************************************/
2988
2989#if CORO_CLONE
2990# include "clone.c"
2991#endif
2992
2993/*****************************************************************************/
2994
2995static SV *
2996coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2997{
2998 SV *coro_sv;
2999 struct coro *coro;
3000 MAGIC *mg;
3001 HV *hv;
3002 SV *cb;
3003 int i;
3004
3005 if (argc > 0)
3006 {
3007 cb = s_get_cv_croak (argv [0]);
3008
3009 if (!is_coro)
3010 {
3011 if (CvISXSUB (cb))
3012 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3013
3014 if (!CvROOT (cb))
3015 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3016 }
3017 }
3018
3019 Newz (0, coro, 1, struct coro);
3020 coro->args = newAV ();
3021 coro->flags = CF_NEW;
3022
3023 if (coro_first) coro_first->prev = coro;
3024 coro->next = coro_first;
3025 coro_first = coro;
3026
3027 coro->hv = hv = newHV ();
3028 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3029 mg->mg_flags |= MGf_DUP;
3030 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3031
3032 if (argc > 0)
3033 {
3034 av_extend (coro->args, argc + is_coro - 1);
3035
3036 if (is_coro)
3037 {
3038 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3039 cb = (SV *)cv_coro_run;
3040 }
3041
3042 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3043
3044 for (i = 1; i < argc; i++)
3045 av_push (coro->args, newSVsv (argv [i]));
3046 }
3047
3048 return coro_sv;
3049}
2503 3050
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3051MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 3052
2506PROTOTYPES: DISABLE 3053PROTOTYPES: DISABLE
2507 3054
… …
2512 coro_thx = PERL_GET_CONTEXT; 3059 coro_thx = PERL_GET_CONTEXT;
2513# endif 3060# endif
2514#endif 3061#endif
2515 BOOT_PAGESIZE; 3062 BOOT_PAGESIZE;
2516 3063
3064 cctx_current = cctx_new_empty ();
3065
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3066 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3067 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 3068
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3069 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3070 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2540 3089
2541 { 3090 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3091 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 3092
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3093 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 3094 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 3095
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3096 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 3097 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 3098 }
2552 3099
2553 coroapi.ver = CORO_API_VERSION; 3100 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 3101 coroapi.rev = CORO_API_REVISION;
2555 3102
… …
2567 3114
2568 if (!svp) croak ("Time::HiRes is required"); 3115 if (!svp) croak ("Time::HiRes is required");
2569 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3116 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2570 3117
2571 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3118 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3119
3120 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3121 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2572 } 3122 }
2573 3123
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3124 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2575} 3125}
2576 3126
2577SV * 3127SV *
2578new (char *klass, ...) 3128new (SV *klass, ...)
3129 ALIAS:
3130 Coro::new = 1
2579 CODE: 3131 CODE:
2580{ 3132 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2581 struct coro *coro; 3133 OUTPUT:
2582 MAGIC *mg;
2583 HV *hv;
2584 int i;
2585
2586 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV ();
2588 coro->flags = CF_NEW;
2589
2590 if (coro_first) coro_first->prev = coro;
2591 coro->next = coro_first;
2592 coro_first = coro;
2593
2594 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598
2599 av_extend (coro->args, items - 1);
2600 for (i = 1; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i)));
2602}
2603 OUTPUT:
2604 RETVAL 3134 RETVAL
2605 3135
2606void 3136void
2607transfer (...) 3137transfer (...)
2608 PROTOTYPE: $$ 3138 PROTOTYPE: $$
… …
2619void 3149void
2620_exit (int code) 3150_exit (int code)
2621 PROTOTYPE: $ 3151 PROTOTYPE: $
2622 CODE: 3152 CODE:
2623 _exit (code); 3153 _exit (code);
3154
3155SV *
3156clone (Coro::State coro)
3157 CODE:
3158{
3159#if CORO_CLONE
3160 struct coro *ncoro = coro_clone (aTHX_ coro);
3161 MAGIC *mg;
3162 /* TODO: too much duplication */
3163 ncoro->hv = newHV ();
3164 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3165 mg->mg_flags |= MGf_DUP;
3166 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3167#else
3168 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3169#endif
3170}
3171 OUTPUT:
3172 RETVAL
2624 3173
2625int 3174int
2626cctx_stacksize (int new_stacksize = 0) 3175cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 3176 PROTOTYPE: ;$
2628 CODE: 3177 CODE:
… …
2678 eval = 1 3227 eval = 1
2679 CODE: 3228 CODE:
2680{ 3229{
2681 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3230 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2682 { 3231 {
2683 struct coro temp; 3232 struct coro *current = SvSTATE_current;
2684 3233
2685 if (!(coro->flags & CF_RUNNING)) 3234 if (current != coro)
2686 { 3235 {
2687 PUTBACK; 3236 PUTBACK;
2688 save_perl (aTHX_ &temp); 3237 save_perl (aTHX_ current);
2689 load_perl (aTHX_ coro); 3238 load_perl (aTHX_ coro);
3239 SPAGAIN;
2690 } 3240 }
2691 3241
2692 {
2693 dSP;
2694 ENTER;
2695 SAVETMPS;
2696 PUTBACK;
2697 PUSHSTACK; 3242 PUSHSTACK;
3243
2698 PUSHMARK (SP); 3244 PUSHMARK (SP);
3245 PUTBACK;
2699 3246
2700 if (ix) 3247 if (ix)
2701 eval_sv (coderef, 0); 3248 eval_sv (coderef, 0);
2702 else 3249 else
2703 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3250 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2704 3251
2705 POPSTACK; 3252 POPSTACK;
2706 SPAGAIN; 3253 SPAGAIN;
2707 FREETMPS;
2708 LEAVE;
2709 PUTBACK;
2710 }
2711 3254
2712 if (!(coro->flags & CF_RUNNING)) 3255 if (current != coro)
2713 { 3256 {
3257 PUTBACK;
2714 save_perl (aTHX_ coro); 3258 save_perl (aTHX_ coro);
2715 load_perl (aTHX_ &temp); 3259 load_perl (aTHX_ current);
2716 SPAGAIN; 3260 SPAGAIN;
2717 } 3261 }
2718 } 3262 }
2719} 3263}
2720 3264
… …
2724 ALIAS: 3268 ALIAS:
2725 is_ready = CF_READY 3269 is_ready = CF_READY
2726 is_running = CF_RUNNING 3270 is_running = CF_RUNNING
2727 is_new = CF_NEW 3271 is_new = CF_NEW
2728 is_destroyed = CF_DESTROYED 3272 is_destroyed = CF_DESTROYED
3273 is_suspended = CF_SUSPENDED
2729 CODE: 3274 CODE:
2730 RETVAL = boolSV (coro->flags & ix); 3275 RETVAL = boolSV (coro->flags & ix);
2731 OUTPUT: 3276 OUTPUT:
2732 RETVAL 3277 RETVAL
2733 3278
2734void 3279void
2735throw (Coro::State self, SV *throw = &PL_sv_undef) 3280throw (Coro::State self, SV *exception = &PL_sv_undef)
2736 PROTOTYPE: $;$ 3281 PROTOTYPE: $;$
2737 CODE: 3282 CODE:
2738{ 3283{
2739 struct coro *current = SvSTATE_current; 3284 struct coro *current = SvSTATE_current;
2740 SV **throwp = self == current ? &CORO_THROW : &self->except; 3285 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2741 SvREFCNT_dec (*throwp); 3286 SvREFCNT_dec (*exceptionp);
2742 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3287 SvGETMAGIC (exception);
3288 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2743} 3289}
2744 3290
2745void 3291void
2746api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3292api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2747 PROTOTYPE: $;$ 3293 PROTOTYPE: $;$
… …
2749 3295
2750SV * 3296SV *
2751has_cctx (Coro::State coro) 3297has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3298 PROTOTYPE: $
2753 CODE: 3299 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3300 /* maybe manage the running flag differently */
3301 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3302 OUTPUT:
2756 RETVAL 3303 RETVAL
2757 3304
2758int 3305int
2759is_traced (Coro::State coro) 3306is_traced (Coro::State coro)
… …
2779 3326
2780void 3327void
2781force_cctx () 3328force_cctx ()
2782 PROTOTYPE: 3329 PROTOTYPE:
2783 CODE: 3330 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3331 cctx_current->idle_sp = 0;
2785 3332
2786void 3333void
2787swap_defsv (Coro::State self) 3334swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3335 PROTOTYPE: $
2789 ALIAS: 3336 ALIAS:
… …
2797 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3344 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2798 3345
2799 SV *tmp = *src; *src = *dst; *dst = tmp; 3346 SV *tmp = *src; *src = *dst; *dst = tmp;
2800 } 3347 }
2801 3348
3349void
3350cancel (Coro::State self)
3351 CODE:
3352 coro_state_destroy (aTHX_ self);
3353 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3354
3355
3356SV *
3357enable_times (int enabled = enable_times)
3358 CODE:
3359{
3360 RETVAL = boolSV (enable_times);
3361
3362 if (enabled != enable_times)
3363 {
3364 enable_times = enabled;
3365
3366 coro_times_update ();
3367 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3368 }
3369}
3370 OUTPUT:
3371 RETVAL
3372
3373void
3374times (Coro::State self)
3375 PPCODE:
3376{
3377 struct coro *current = SvSTATE (coro_current);
3378
3379 if (expect_false (current == self))
3380 {
3381 coro_times_update ();
3382 coro_times_add (SvSTATE (coro_current));
3383 }
3384
3385 EXTEND (SP, 2);
3386 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3387 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3388
3389 if (expect_false (current == self))
3390 coro_times_sub (SvSTATE (coro_current));
3391}
3392
3393void
3394swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3395 CODE:
3396{
3397 struct coro *current = SvSTATE_current;
3398
3399 if (current == coro)
3400 SWAP_SVS (current);
3401
3402 if (!coro->swap_sv)
3403 coro->swap_sv = newAV ();
3404
3405 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3406 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3407
3408 if (current == coro)
3409 SWAP_SVS (current);
3410}
3411
2802 3412
2803MODULE = Coro::State PACKAGE = Coro 3413MODULE = Coro::State PACKAGE = Coro
2804 3414
2805BOOT: 3415BOOT:
2806{ 3416{
2807 int i;
2808
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3417 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3418 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3419 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3420 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3421 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3422 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3423 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3424 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3425 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2815 3426
3427 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3428 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3429 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3430 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3431
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3432 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3433
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3434 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3435 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3436 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2821 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3437 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2822 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3438 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2823 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3439 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2824
2825 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2826 coro_ready[i] = newAV ();
2827 3440
2828 { 3441 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3442 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3443
2831 coroapi.schedule = api_schedule; 3444 coroapi.schedule = api_schedule;
3445 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3446 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3447 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3448 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3449 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3450 coroapi.nready = coro_nready;
… …
2840 sv_setiv (sv, (IV)&coroapi); 3454 sv_setiv (sv, (IV)&coroapi);
2841 SvREADONLY_on (sv); 3455 SvREADONLY_on (sv);
2842 } 3456 }
2843} 3457}
2844 3458
3459SV *
3460async (...)
3461 PROTOTYPE: &@
3462 CODE:
3463 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3464 api_ready (aTHX_ RETVAL);
3465 OUTPUT:
3466 RETVAL
3467
3468void
3469terminate (...)
3470 CODE:
3471 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3472
2845void 3473void
2846schedule (...) 3474schedule (...)
2847 CODE: 3475 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3476 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3477
3478void
3479schedule_to (...)
3480 CODE:
3481 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3482
3483void
3484cede_to (...)
3485 CODE:
3486 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3487
2850void 3488void
2851cede (...) 3489cede (...)
2852 CODE: 3490 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3491 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2867void 3505void
2868_set_readyhook (SV *hook) 3506_set_readyhook (SV *hook)
2869 PROTOTYPE: $ 3507 PROTOTYPE: $
2870 CODE: 3508 CODE:
2871 SvREFCNT_dec (coro_readyhook); 3509 SvREFCNT_dec (coro_readyhook);
3510 SvGETMAGIC (hook);
3511 if (SvOK (hook))
3512 {
2872 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3513 coro_readyhook = newSVsv (hook);
3514 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3515 }
3516 else
3517 {
3518 coro_readyhook = 0;
3519 CORO_READYHOOK = 0;
3520 }
2873 3521
2874int 3522int
2875prio (Coro::State coro, int newprio = 0) 3523prio (Coro::State coro, int newprio = 0)
2876 PROTOTYPE: $;$ 3524 PROTOTYPE: $;$
2877 ALIAS: 3525 ALIAS:
… …
2883 if (items > 1) 3531 if (items > 1)
2884 { 3532 {
2885 if (ix) 3533 if (ix)
2886 newprio = coro->prio - newprio; 3534 newprio = coro->prio - newprio;
2887 3535
2888 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3536 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2889 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3537 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2890 3538
2891 coro->prio = newprio; 3539 coro->prio = newprio;
2892 } 3540 }
2893} 3541}
2894 OUTPUT: 3542 OUTPUT:
… …
2908 CODE: 3556 CODE:
2909 RETVAL = coro_nready; 3557 RETVAL = coro_nready;
2910 OUTPUT: 3558 OUTPUT:
2911 RETVAL 3559 RETVAL
2912 3560
2913# for async_pool speedup
2914void 3561void
2915_pool_1 (SV *cb) 3562suspend (Coro::State self)
3563 PROTOTYPE: $
2916 CODE: 3564 CODE:
2917{ 3565 self->flags |= CF_SUSPENDED;
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3566
2925 if (!invoke) 3567void
3568resume (Coro::State self)
3569 PROTOTYPE: $
3570 CODE:
3571 self->flags &= ~CF_SUSPENDED;
3572
3573void
3574_pool_handler (...)
3575 CODE:
3576 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3577
3578void
3579async_pool (SV *cv, ...)
3580 PROTOTYPE: &@
3581 PPCODE:
3582{
3583 HV *hv = (HV *)av_pop (av_async_pool);
3584 AV *av = newAV ();
3585 SV *cb = ST (0);
3586 int i;
3587
3588 av_extend (av, items - 2);
3589 for (i = 1; i < items; ++i)
3590 av_push (av, SvREFCNT_inc_NN (ST (i)));
3591
3592 if ((SV *)hv == &PL_sv_undef)
2926 { 3593 {
2927 SV *old = PL_diehook; 3594 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2928 PL_diehook = 0; 3595 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2929 SvREFCNT_dec (old); 3596 SvREFCNT_dec (sv);
2930 croak ("\3async_pool terminate\2\n");
2931 } 3597 }
2932 3598
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3599 {
2946 av_fill (defav, len - 1); 3600 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3601
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3602 assert (!coro->invoke_cb);
3603 assert (!coro->invoke_av);
3604 coro->invoke_cb = SvREFCNT_inc (cb);
3605 coro->invoke_av = av;
2949 } 3606 }
2950}
2951 3607
2952void 3608 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3609
2959 sv_setsv (cb, &PL_sv_undef); 3610 if (GIMME_V != G_VOID)
2960 3611 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3612 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3613 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3614}
2984 3615
2985SV * 3616SV *
2986rouse_cb () 3617rouse_cb ()
2987 PROTOTYPE: 3618 PROTOTYPE:
… …
2989 RETVAL = coro_new_rouse_cb (aTHX); 3620 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3621 OUTPUT:
2991 RETVAL 3622 RETVAL
2992 3623
2993void 3624void
2994rouse_wait (SV *cb = 0) 3625rouse_wait (...)
2995 PROTOTYPE: ;$ 3626 PROTOTYPE: ;$
2996 PPCODE: 3627 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3628 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3629
3630void
3631on_enter (SV *block)
3632 ALIAS:
3633 on_leave = 1
3634 PROTOTYPE: &
3635 CODE:
3636{
3637 struct coro *coro = SvSTATE_current;
3638 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3639
3640 block = s_get_cv_croak (block);
3641
3642 if (!*avp)
3643 *avp = newAV ();
3644
3645 av_push (*avp, SvREFCNT_inc (block));
3646
3647 if (!ix)
3648 on_enterleave_call (aTHX_ block);
3649
3650 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3651 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3652 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3653}
3654
2999 3655
3000MODULE = Coro::State PACKAGE = PerlIO::cede 3656MODULE = Coro::State PACKAGE = PerlIO::cede
3001 3657
3002BOOT: 3658BOOT:
3003 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3659 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3006MODULE = Coro::State PACKAGE = Coro::Semaphore 3662MODULE = Coro::State PACKAGE = Coro::Semaphore
3007 3663
3008SV * 3664SV *
3009new (SV *klass, SV *count = 0) 3665new (SV *klass, SV *count = 0)
3010 CODE: 3666 CODE:
3667{
3668 int semcnt = 1;
3669
3670 if (count)
3671 {
3672 SvGETMAGIC (count);
3673
3674 if (SvOK (count))
3675 semcnt = SvIV (count);
3676 }
3677
3011 RETVAL = sv_bless ( 3678 RETVAL = sv_bless (
3012 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3679 coro_waitarray_new (aTHX_ semcnt),
3013 GvSTASH (CvGV (cv)) 3680 GvSTASH (CvGV (cv))
3014 ); 3681 );
3682}
3015 OUTPUT: 3683 OUTPUT:
3016 RETVAL 3684 RETVAL
3017 3685
3018# helper for Coro::Channel 3686# helper for Coro::Channel and others
3019SV * 3687SV *
3020_alloc (int count) 3688_alloc (int count)
3021 CODE: 3689 CODE:
3022 RETVAL = coro_waitarray_new (aTHX_ count); 3690 RETVAL = coro_waitarray_new (aTHX_ count);
3023 OUTPUT: 3691 OUTPUT:
… …
3036 adjust = 1 3704 adjust = 1
3037 CODE: 3705 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3706 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3707
3040void 3708void
3041down (SV *self) 3709down (...)
3042 CODE: 3710 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3711 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3712
3045void 3713void
3046wait (SV *self) 3714wait (...)
3047 CODE: 3715 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3716 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3717
3050void 3718void
3051try (SV *self) 3719try (SV *self)
… …
3081 for (i = 1; i <= wcount; ++i) 3749 for (i = 1; i <= wcount; ++i)
3082 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3750 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3083 } 3751 }
3084} 3752}
3085 3753
3754MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3755
3756void
3757_may_delete (SV *sem, int count, int extra_refs)
3758 PPCODE:
3759{
3760 AV *av = (AV *)SvRV (sem);
3761
3762 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3763 && AvFILLp (av) == 0 /* no waiters, just count */
3764 && SvIV (AvARRAY (av)[0]) == count)
3765 XSRETURN_YES;
3766
3767 XSRETURN_NO;
3768}
3769
3086MODULE = Coro::State PACKAGE = Coro::Signal 3770MODULE = Coro::State PACKAGE = Coro::Signal
3087 3771
3088SV * 3772SV *
3089new (SV *klass) 3773new (SV *klass)
3090 CODE: 3774 CODE:
… …
3094 ); 3778 );
3095 OUTPUT: 3779 OUTPUT:
3096 RETVAL 3780 RETVAL
3097 3781
3098void 3782void
3099wait (SV *self) 3783wait (...)
3100 CODE: 3784 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3785 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3786
3103void 3787void
3104broadcast (SV *self) 3788broadcast (SV *self)
… …
3161 3845
3162void 3846void
3163_register (char *target, char *proto, SV *req) 3847_register (char *target, char *proto, SV *req)
3164 CODE: 3848 CODE:
3165{ 3849{
3166 HV *st; 3850 SV *req_cv = s_get_cv_croak (req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3851 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3852 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3853 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3854 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3855}
3174 3856
3857MODULE = Coro::State PACKAGE = Coro::Select
3858
3859void
3860patch_pp_sselect ()
3861 CODE:
3862 if (!coro_old_pp_sselect)
3863 {
3864 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3865 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3866 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3867 }
3868
3869void
3870unpatch_pp_sselect ()
3871 CODE:
3872 if (coro_old_pp_sselect)
3873 {
3874 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3875 coro_old_pp_sselect = 0;
3876 }
3877
3878

Diff Legend

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