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.302 by root, Wed Nov 19 04:48:24 2008 UTC vs.
Revision 1.367 by root, Mon Aug 3 09:19:57 2009 UTC

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

Diff Legend

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