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.313 by root, Thu Nov 20 03:22:59 2008 UTC vs.
Revision 1.368 by root, Thu Aug 13 02:35:41 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) && PERL_SUBVERSION >= (c)))))
61
62#if !PERL_VERSION_ATLEAST (5,6,0)
63# ifndef PL_ppaddr
64# define PL_ppaddr ppaddr
65# endif
66# ifndef call_sv
67# define call_sv perl_call_sv
68# endif
69# ifndef get_sv
70# define get_sv perl_get_sv
71# endif
72# ifndef get_cv
73# define get_cv perl_get_cv
74# endif
75# ifndef IS_PADGV
76# define IS_PADGV(v) 0
77# endif
78# ifndef IS_PADCONST
79# define IS_PADCONST(v) 0
80# endif
81#endif
82
83/* 5.11 */
84#ifndef CxHASARGS
85# define CxHASARGS(cx) (cx)->blk_sub.hasargs
86#endif
87
88/* 5.10.0 */
89#ifndef SvREFCNT_inc_NN
90# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
91#endif
92
93/* 5.8.8 */
94#ifndef GV_NOTQUAL
95# define GV_NOTQUAL 0
96#endif
97#ifndef newSV
98# define newSV(l) NEWSV(0,l)
99#endif
100#ifndef CvISXSUB_on
101# define CvISXSUB_on(cv) (void)cv
102#endif
103
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;
181static SV *sv_async_pool_idle; 143static SV *sv_async_pool_idle; /* description string */
182static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
183static SV *sv_Coro; 145static SV *sv_Coro; /* class string */
184static CV *cv_pool_handler; 146static CV *cv_pool_handler;
185static CV *cv_coro_new; 147static CV *cv_coro_state_new;
186 148
187/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
188static 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;
189 157
190static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
191static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
192 160
193enum { 161enum {
… …
219 int valgrind_id; 187 int valgrind_id;
220#endif 188#endif
221 unsigned char flags; 189 unsigned char flags;
222} coro_cctx; 190} coro_cctx;
223 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
224enum { 196enum {
225 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
226 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
227 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
228 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 */
229}; 202};
230 203
231/* 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 */
232typedef struct 205typedef struct
233{ 206{
234 SV *defsv; 207 SV *defsv;
235 AV *defav; 208 AV *defav;
236 SV *errsv; 209 SV *errsv;
237 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
238#define VAR(name,type) type name; 212#define VAR(name,type) type name;
239# include "state.h" 213# include "state.h"
240#undef VAR 214#undef VAR
241} perl_slots; 215} perl_slots;
242 216
… …
244 218
245/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
246struct coro { 220struct coro {
247 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
248 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
249 226
250 /* state data */ 227 /* state data */
251 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
252 AV *mainstack; 229 AV *mainstack;
253 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
… …
270 /* async_pool */ 247 /* async_pool */
271 SV *saved_deffh; 248 SV *saved_deffh;
272 SV *invoke_cb; 249 SV *invoke_cb;
273 AV *invoke_av; 250 AV *invoke_av;
274 251
252 /* on_enter/on_leave */
253 AV *on_enter;
254 AV *on_leave;
255
256 /* times */
257 coro_ts t_cpu, t_real;
258
275 /* linked list */ 259 /* linked list */
276 struct coro *next, *prev; 260 struct coro *next, *prev;
277}; 261};
278 262
279typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
284/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
285static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
286 270
287/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
288 272
289#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
290#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
291#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
292#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
293#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
294#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
295 279
296/* for Coro.pm */ 280/* for Coro.pm */
297static SV *coro_current; 281static SV *coro_current;
298static SV *coro_readyhook; 282static SV *coro_readyhook;
299static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
300static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
301static struct coro *coro_first; 285static struct coro *coro_first;
302#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}
303 307
304/** lowlevel stuff **********************************************************/ 308/** lowlevel stuff **********************************************************/
305 309
306static SV * 310static SV *
307coro_get_sv (pTHX_ const char *name, int create) 311coro_get_sv (pTHX_ const char *name, int create)
… …
331 get_hv (name, create); 335 get_hv (name, create);
332#endif 336#endif
333 return get_hv (name, create); 337 return get_hv (name, create);
334} 338}
335 339
336/* may croak */ 340INLINE void
337INLINE CV * 341coro_times_update ()
338coro_sv_2cv (pTHX_ SV *sv)
339{ 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{
340 HV *st; 409 HV *stash;
341 GV *gvp; 410 MAGIC *mg;
342 return sv_2cv (sv, &st, &gvp, 0); 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;
343} 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 */
344 438
345static AV * 439static AV *
346coro_clone_padlist (pTHX_ CV *cv) 440coro_derive_padlist (pTHX_ CV *cv)
347{ 441{
348 AV *padlist = CvPADLIST (cv); 442 AV *padlist = CvPADLIST (cv);
349 AV *newpadlist, *newpad; 443 AV *newpadlist, *newpad;
350 444
351 newpadlist = newAV (); 445 newpadlist = newAV ();
… …
356 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 450 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
357#endif 451#endif
358 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 452 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
359 --AvFILLp (padlist); 453 --AvFILLp (padlist);
360 454
361 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 455 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
362 av_store (newpadlist, 1, (SV *)newpad); 456 av_store (newpadlist, 1, (SV *)newpad);
363 457
364 return newpadlist; 458 return newpadlist;
365} 459}
366 460
367static void 461static void
368free_padlist (pTHX_ AV *padlist) 462free_padlist (pTHX_ AV *padlist)
369{ 463{
370 /* may be during global destruction */ 464 /* may be during global destruction */
371 if (SvREFCNT (padlist)) 465 if (!IN_DESTRUCT)
372 { 466 {
373 I32 i = AvFILLp (padlist); 467 I32 i = AvFILLp (padlist);
374 while (i >= 0) 468
469 while (i > 0) /* special-case index 0 */
375 { 470 {
376 SV **svp = av_fetch (padlist, i--, FALSE); 471 /* we try to be extra-careful here */
377 if (svp) 472 AV *av = (AV *)AvARRAY (padlist)[i--];
378 { 473 I32 j = AvFILLp (av);
379 SV *sv; 474
380 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 475 while (j >= 0)
476 SvREFCNT_dec (AvARRAY (av)[j--]);
477
478 AvFILLp (av) = -1;
381 SvREFCNT_dec (sv); 479 SvREFCNT_dec (av);
382
383 SvREFCNT_dec (*svp);
384 }
385 } 480 }
386 481
482 SvREFCNT_dec (AvARRAY (padlist)[0]);
483
484 AvFILLp (padlist) = -1;
387 SvREFCNT_dec ((SV*)padlist); 485 SvREFCNT_dec ((SV*)padlist);
388 } 486 }
389} 487}
390 488
391static int 489static int
392coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 490coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
393{ 491{
394 AV *padlist; 492 AV *padlist;
395 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;
396 498
397 /* casting is fun. */ 499 /* casting is fun. */
398 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 500 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
399 free_padlist (aTHX_ padlist); 501 free_padlist (aTHX_ padlist);
400 502
401 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 503 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
402 504
403 return 0; 505 return 0;
404} 506}
405
406#define CORO_MAGIC_type_cv 26
407#define CORO_MAGIC_type_state PERL_MAGIC_ext
408 507
409static MGVTBL coro_cv_vtbl = { 508static MGVTBL coro_cv_vtbl = {
410 0, 0, 0, 0, 509 0, 0, 0, 0,
411 coro_cv_free 510 coro_cv_free
412}; 511};
413
414#define CORO_MAGIC_NN(sv, type) \
415 (expect_true (SvMAGIC (sv)->mg_type == type) \
416 ? SvMAGIC (sv) \
417 : mg_find (sv, type))
418
419#define CORO_MAGIC(sv, type) \
420 (expect_true (SvMAGIC (sv)) \
421 ? CORO_MAGIC_NN (sv, type) \
422 : 0)
423
424#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
425#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
426
427INLINE struct coro *
428SvSTATE_ (pTHX_ SV *coro)
429{
430 HV *stash;
431 MAGIC *mg;
432
433 if (SvROK (coro))
434 coro = SvRV (coro);
435
436 if (expect_false (SvTYPE (coro) != SVt_PVHV))
437 croak ("Coro::State object required");
438
439 stash = SvSTASH (coro);
440 if (expect_false (stash != coro_stash && stash != coro_state_stash))
441 {
442 /* very slow, but rare, check */
443 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
444 croak ("Coro::State object required");
445 }
446
447 mg = CORO_MAGIC_state (coro);
448 return (struct coro *)mg->mg_ptr;
449}
450
451#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
452
453/* faster than SvSTATE, but expects a coroutine hv */
454#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
455#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
456 512
457/* the next two functions merely cache the padlists */ 513/* the next two functions merely cache the padlists */
458static void 514static void
459get_padlist (pTHX_ CV *cv) 515get_padlist (pTHX_ CV *cv)
460{ 516{
… …
471 CV *cp = Perl_cv_clone (aTHX_ cv); 527 CV *cp = Perl_cv_clone (aTHX_ cv);
472 CvPADLIST (cv) = CvPADLIST (cp); 528 CvPADLIST (cv) = CvPADLIST (cp);
473 CvPADLIST (cp) = 0; 529 CvPADLIST (cp) = 0;
474 SvREFCNT_dec (cp); 530 SvREFCNT_dec (cp);
475#else 531#else
476 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 532 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
477#endif 533#endif
478 } 534 }
479} 535}
480 536
481static void 537static void
… …
488 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);
489 545
490 av = (AV *)mg->mg_obj; 546 av = (AV *)mg->mg_obj;
491 547
492 if (expect_false (AvFILLp (av) >= AvMAX (av))) 548 if (expect_false (AvFILLp (av) >= AvMAX (av)))
493 av_extend (av, AvMAX (av) + 1); 549 av_extend (av, AvFILLp (av) + 1);
494 550
495 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
496} 552}
497 553
498/** load & save, init *******************************************************/ 554/** load & save, init *******************************************************/
555
556static void
557on_enterleave_call (pTHX_ SV *cb);
499 558
500static void 559static void
501load_perl (pTHX_ Coro__State c) 560load_perl (pTHX_ Coro__State c)
502{ 561{
503 perl_slots *slot = c->slot; 562 perl_slots *slot = c->slot;
504 c->slot = 0; 563 c->slot = 0;
505 564
506 PL_mainstack = c->mainstack; 565 PL_mainstack = c->mainstack;
507 566
508 GvSV (PL_defgv) = slot->defsv; 567 GvSV (PL_defgv) = slot->defsv;
509 GvAV (PL_defgv) = slot->defav; 568 GvAV (PL_defgv) = slot->defav;
510 GvSV (PL_errgv) = slot->errsv; 569 GvSV (PL_errgv) = slot->errsv;
511 GvSV (irsgv) = slot->irsgv; 570 GvSV (irsgv) = slot->irsgv;
571 GvHV (PL_hintgv) = slot->hinthv;
512 572
513 #define VAR(name,type) PL_ ## name = slot->name; 573 #define VAR(name,type) PL_ ## name = slot->name;
514 # include "state.h" 574 # include "state.h"
515 #undef VAR 575 #undef VAR
516 576
… …
530 PUTBACK; 590 PUTBACK;
531 } 591 }
532 592
533 slf_frame = c->slf_frame; 593 slf_frame = c->slf_frame;
534 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 }
535} 611}
536 612
537static void 613static void
538save_perl (pTHX_ Coro__State c) 614save_perl (pTHX_ Coro__State c)
539{ 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
540 c->except = CORO_THROW; 632 c->except = CORO_THROW;
541 c->slf_frame = slf_frame; 633 c->slf_frame = slf_frame;
542 634
543 { 635 {
544 dSP; 636 dSP;
… …
557 { 649 {
558 while (expect_true (cxix >= 0)) 650 while (expect_true (cxix >= 0))
559 { 651 {
560 PERL_CONTEXT *cx = &ccstk[cxix--]; 652 PERL_CONTEXT *cx = &ccstk[cxix--];
561 653
562 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))
563 { 655 {
564 CV *cv = cx->blk_sub.cv; 656 CV *cv = cx->blk_sub.cv;
565 657
566 if (expect_true (CvDEPTH (cv))) 658 if (expect_true (CvDEPTH (cv)))
567 { 659 {
… …
591 /* we manually unroll here, as usually 2 slots is enough */ 683 /* we manually unroll here, as usually 2 slots is enough */
592 if (SLOT_COUNT >= 1) CXINC; 684 if (SLOT_COUNT >= 1) CXINC;
593 if (SLOT_COUNT >= 2) CXINC; 685 if (SLOT_COUNT >= 2) CXINC;
594 if (SLOT_COUNT >= 3) CXINC; 686 if (SLOT_COUNT >= 3) CXINC;
595 { 687 {
596 int i; 688 unsigned int i;
597 for (i = 3; i < SLOT_COUNT; ++i) 689 for (i = 3; i < SLOT_COUNT; ++i)
598 CXINC; 690 CXINC;
599 } 691 }
600 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 692 cxstack_ix -= SLOT_COUNT; /* undo allocation */
601 693
602 c->mainstack = PL_mainstack; 694 c->mainstack = PL_mainstack;
603 695
604 { 696 {
605 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 697 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
606 698
607 slot->defav = GvAV (PL_defgv); 699 slot->defav = GvAV (PL_defgv);
608 slot->defsv = DEFSV; 700 slot->defsv = DEFSV;
609 slot->errsv = ERRSV; 701 slot->errsv = ERRSV;
610 slot->irsgv = GvSV (irsgv); 702 slot->irsgv = GvSV (irsgv);
703 slot->hinthv = GvHV (PL_hintgv);
611 704
612 #define VAR(name,type) slot->name = PL_ ## name; 705 #define VAR(name,type) slot->name = PL_ ## name;
613 # include "state.h" 706 # include "state.h"
614 #undef VAR 707 #undef VAR
615 } 708 }
… …
742#endif 835#endif
743 836
744/* 837/*
745 * This overrides the default magic get method of %SIG elements. 838 * This overrides the default magic get method of %SIG elements.
746 * 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
747 * 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
748 * readback here. 841 * readback here.
749 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
750 * not expecting this to actually change the hook. This is a potential problem
751 * when a schedule happens then, but we ignore this.
752 */ 842 */
753static int 843static int
754coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 844coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
755{ 845{
756 const char *s = MgPV_nolen_const (mg); 846 const char *s = MgPV_nolen_const (mg);
… …
809 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 899 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
810 900
811 if (svp) 901 if (svp)
812 { 902 {
813 SV *old = *svp; 903 SV *old = *svp;
814 *svp = newSVsv (sv); 904 *svp = SvOK (sv) ? newSVsv (sv) : 0;
815 SvREFCNT_dec (old); 905 SvREFCNT_dec (old);
816 return 0; 906 return 0;
817 } 907 }
818 } 908 }
819 909
… …
829 919
830static int 920static int
831slf_check_nop (pTHX_ struct CoroSLF *frame) 921slf_check_nop (pTHX_ struct CoroSLF *frame)
832{ 922{
833 return 0; 923 return 0;
924}
925
926static int
927slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{
929 return 1;
834} 930}
835 931
836static UNOP coro_setup_op; 932static UNOP coro_setup_op;
837 933
838static 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 */
… …
845 941
846 PL_runops = RUNOPS_DEFAULT; 942 PL_runops = RUNOPS_DEFAULT;
847 PL_curcop = &PL_compiling; 943 PL_curcop = &PL_compiling;
848 PL_in_eval = EVAL_NULL; 944 PL_in_eval = EVAL_NULL;
849 PL_comppad = 0; 945 PL_comppad = 0;
946 PL_comppad_name = 0;
947 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0;
850 PL_curpm = 0; 949 PL_curpm = 0;
851 PL_curpad = 0; 950 PL_curpad = 0;
852 PL_localizing = 0; 951 PL_localizing = 0;
853 PL_dirty = 0; 952 PL_dirty = 0;
854 PL_restartop = 0; 953 PL_restartop = 0;
855#if PERL_VERSION_ATLEAST (5,10,0) 954#if PERL_VERSION_ATLEAST (5,10,0)
856 PL_parser = 0; 955 PL_parser = 0;
857#endif 956#endif
957 PL_hints = 0;
858 958
859 /* recreate the die/warn hooks */ 959 /* recreate the die/warn hooks */
860 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 );
861 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);
862 962
863 GvSV (PL_defgv) = newSV (0); 963 GvSV (PL_defgv) = newSV (0);
864 GvAV (PL_defgv) = coro->args; coro->args = 0; 964 GvAV (PL_defgv) = coro->args; coro->args = 0;
865 GvSV (PL_errgv) = newSV (0); 965 GvSV (PL_errgv) = newSV (0);
866 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;
867 PL_rs = newSVsv (GvSV (irsgv)); 968 PL_rs = newSVsv (GvSV (irsgv));
868 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 969 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
869 970
870 { 971 {
871 dSP; 972 dSP;
… …
889 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 */
890 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 */
891 992
892 /* 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 */
893 coro_setup_op.op_next = PL_op; 994 coro_setup_op.op_next = PL_op;
894 coro_setup_op.op_type = OP_CUSTOM; 995 coro_setup_op.op_type = OP_ENTERSUB;
895 coro_setup_op.op_ppaddr = pp_slf; 996 coro_setup_op.op_ppaddr = pp_slf;
896 /* no flags etc. required, as an init function won't be called */ 997 /* no flags etc. required, as an init function won't be called */
897 998
898 PL_op = (OP *)&coro_setup_op; 999 PL_op = (OP *)&coro_setup_op;
899 1000
900 /* copy throw, in case it was set before coro_setup */ 1001 /* copy throw, in case it was set before coro_setup */
901 CORO_THROW = coro->except; 1002 CORO_THROW = coro->except;
902}
903 1003
1004 if (expect_false (enable_times))
1005 {
1006 coro_times_update ();
1007 coro_times_sub (coro);
1008 }
1009}
1010
904static void 1011static void
905coro_destruct (pTHX_ struct coro *coro) 1012coro_unwind_stacks (pTHX)
906{ 1013{
907 if (!IN_DESTRUCT) 1014 if (!IN_DESTRUCT)
908 { 1015 {
909 /* restore all saved variables and stuff */ 1016 /* restore all saved variables and stuff */
910 LEAVE_SCOPE (0); 1017 LEAVE_SCOPE (0);
… …
918 POPSTACK_TO (PL_mainstack); 1025 POPSTACK_TO (PL_mainstack);
919 1026
920 /* unwind main stack */ 1027 /* unwind main stack */
921 dounwind (-1); 1028 dounwind (-1);
922 } 1029 }
1030}
923 1031
924 SvREFCNT_dec (GvSV (PL_defgv)); 1032static void
925 SvREFCNT_dec (GvAV (PL_defgv)); 1033coro_destruct_perl (pTHX_ struct coro *coro)
926 SvREFCNT_dec (GvSV (PL_errgv)); 1034{
927 SvREFCNT_dec (PL_defoutgv); 1035 SV *svf [9];
928 SvREFCNT_dec (PL_rs);
929 SvREFCNT_dec (GvSV (irsgv));
930 1036
931 SvREFCNT_dec (PL_diehook);
932 SvREFCNT_dec (PL_warnhook);
933 1037 {
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
934 SvREFCNT_dec (coro->saved_deffh); 1069 SvREFCNT_dec (coro->saved_deffh);
935 SvREFCNT_dec (coro->rouse_cb); 1070 SvREFCNT_dec (coro->rouse_cb);
936 SvREFCNT_dec (coro->invoke_cb); 1071 SvREFCNT_dec (coro->invoke_cb);
937 SvREFCNT_dec (coro->invoke_av); 1072 SvREFCNT_dec (coro->invoke_av);
938 1073 }
939 coro_destruct_stacks (aTHX);
940} 1074}
941 1075
942INLINE void 1076INLINE void
943free_coro_mortal (pTHX) 1077free_coro_mortal (pTHX)
944{ 1078{
… …
952static int 1086static int
953runops_trace (pTHX) 1087runops_trace (pTHX)
954{ 1088{
955 COP *oldcop = 0; 1089 COP *oldcop = 0;
956 int oldcxix = -2; 1090 int oldcxix = -2;
957 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
958 coro_cctx *cctx = coro->cctx;
959 1091
960 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1092 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
961 { 1093 {
962 PERL_ASYNC_CHECK (); 1094 PERL_ASYNC_CHECK ();
963 1095
964 if (cctx->flags & CC_TRACE_ALL) 1096 if (cctx_current->flags & CC_TRACE_ALL)
965 { 1097 {
966 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)
967 { 1099 {
968 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1100 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
969 SV **bot, **top; 1101 SV **bot, **top;
970 AV *av = newAV (); /* return values */ 1102 AV *av = newAV (); /* return values */
971 SV **cb; 1103 SV **cb;
… …
1008 1140
1009 if (PL_curcop != &PL_compiling) 1141 if (PL_curcop != &PL_compiling)
1010 { 1142 {
1011 SV **cb; 1143 SV **cb;
1012 1144
1013 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1145 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1014 { 1146 {
1015 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1147 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1016 1148
1017 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1149 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1018 { 1150 {
1019 runops_proc_t old_runops = PL_runops;
1020 dSP; 1151 dSP;
1021 GV *gv = CvGV (cx->blk_sub.cv); 1152 GV *gv = CvGV (cx->blk_sub.cv);
1022 SV *fullname = sv_2mortal (newSV (0)); 1153 SV *fullname = sv_2mortal (newSV (0));
1023 1154
1024 if (isGV (gv)) 1155 if (isGV (gv))
… …
1042 } 1173 }
1043 1174
1044 oldcxix = cxstack_ix; 1175 oldcxix = cxstack_ix;
1045 } 1176 }
1046 1177
1047 if (cctx->flags & CC_TRACE_LINE) 1178 if (cctx_current->flags & CC_TRACE_LINE)
1048 { 1179 {
1049 dSP; 1180 dSP;
1050 1181
1051 PL_runops = RUNOPS_DEFAULT; 1182 PL_runops = RUNOPS_DEFAULT;
1052 ENTER; 1183 ENTER;
… …
1071 1202
1072 TAINT_NOT; 1203 TAINT_NOT;
1073 return 0; 1204 return 0;
1074} 1205}
1075 1206
1076static struct coro_cctx *cctx_ssl_cctx;
1077static struct CoroSLF cctx_ssl_frame; 1207static struct CoroSLF cctx_ssl_frame;
1078 1208
1079static void 1209static void
1080slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1210slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1081{ 1211{
1082 ta->prev = (struct coro *)cctx_ssl_cctx;
1083 ta->next = 0; 1212 ta->prev = 0;
1084} 1213}
1085 1214
1086static int 1215static int
1087slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1216slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1088{ 1217{
… …
1091 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 */
1092} 1221}
1093 1222
1094/* 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 */
1095static void NOINLINE 1224static void NOINLINE
1096cctx_prepare (pTHX_ coro_cctx *cctx) 1225cctx_prepare (pTHX)
1097{ 1226{
1098 PL_top_env = &PL_start_env; 1227 PL_top_env = &PL_start_env;
1099 1228
1100 if (cctx->flags & CC_TRACE) 1229 if (cctx_current->flags & CC_TRACE)
1101 PL_runops = runops_trace; 1230 PL_runops = runops_trace;
1102 1231
1103 /* 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
1104 * that can lead to creation of a new cctx */ 1233 * that can lead to creation of a new cctx */
1105 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)",
1106 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1235 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1107 1236
1108 /* 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 */
1109 cctx_ssl_cctx = cctx;
1110 cctx_ssl_frame = slf_frame; 1238 cctx_ssl_frame = slf_frame;
1111 1239
1112 slf_frame.prepare = slf_prepare_set_stacklevel; 1240 slf_frame.prepare = slf_prepare_set_stacklevel;
1113 slf_frame.check = slf_check_set_stacklevel; 1241 slf_frame.check = slf_check_set_stacklevel;
1114} 1242}
… …
1137 /* normally we would need to skip the entersub here */ 1265 /* normally we would need to skip the entersub here */
1138 /* 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 */
1139 /* PL_nop = PL_nop->op_next */ 1267 /* PL_nop = PL_nop->op_next */
1140 1268
1141 /* inject a fake subroutine call to cctx_init */ 1269 /* inject a fake subroutine call to cctx_init */
1142 cctx_prepare (aTHX_ (coro_cctx *)arg); 1270 cctx_prepare (aTHX);
1143 1271
1144 /* cctx_run is the alternative tail of transfer() */ 1272 /* cctx_run is the alternative tail of transfer() */
1145 transfer_tail (aTHX); 1273 transfer_tail (aTHX);
1146 1274
1147 /* 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 */
1148 PL_restartop = PL_op; 1276 PL_restartop = PL_op;
1149 perl_run (PL_curinterp); 1277 perl_run (PL_curinterp);
1150 /* 1278 /*
1151 * Unfortunately, there is no way to get at the return values of the 1279 * Unfortunately, there is no way to get at the return values of the
1152 * coro body here, as perl_run destroys these 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.
1153 */ 1282 */
1154 1283
1155 /* 1284 /*
1156 * 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
1157 * 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)
1158 * 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
1159 * bootstrap-time "top" top_env, as we cannot restore the "main" 1288 * bootstrap-time "top" top_env, as we cannot restore the "main"
1160 * 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.
1161 */ 1292 */
1162 PL_top_env = main_top_env; 1293 PL_top_env = main_top_env;
1163 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 */
1164 } 1295 }
1165} 1296}
… …
1242cctx_destroy (coro_cctx *cctx) 1373cctx_destroy (coro_cctx *cctx)
1243{ 1374{
1244 if (!cctx) 1375 if (!cctx)
1245 return; 1376 return;
1246 1377
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1379
1247 --cctx_count; 1380 --cctx_count;
1248 coro_destroy (&cctx->cctx); 1381 coro_destroy (&cctx->cctx);
1249 1382
1250 /* coro_transfer creates new, empty cctx's */ 1383 /* coro_transfer creates new, empty cctx's */
1251 if (cctx->sptr) 1384 if (cctx->sptr)
… …
1314 /* TODO: throwing up here is considered harmful */ 1447 /* TODO: throwing up here is considered harmful */
1315 1448
1316 if (expect_true (prev != next)) 1449 if (expect_true (prev != next))
1317 { 1450 {
1318 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1451 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1319 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,");
1320 1453
1321 if (expect_false (next->flags & CF_RUNNING))
1322 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1323
1324 if (expect_false (next->flags & CF_DESTROYED)) 1454 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1325 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,");
1326 1456
1327#if !PERL_VERSION_ATLEAST (5,10,0) 1457#if !PERL_VERSION_ATLEAST (5,10,0)
1328 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1458 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1329 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,");
1330#endif 1460#endif
… …
1336transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1466transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1337{ 1467{
1338 dSTACKLEVEL; 1468 dSTACKLEVEL;
1339 1469
1340 /* sometimes transfer is only called to set idle_sp */ 1470 /* sometimes transfer is only called to set idle_sp */
1341 if (expect_false (!next)) 1471 if (expect_false (!prev))
1342 { 1472 {
1343 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1473 cctx_current->idle_sp = STACKLEVEL;
1344 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 */
1345 } 1475 }
1346 else if (expect_true (prev != next)) 1476 else if (expect_true (prev != next))
1347 { 1477 {
1348 coro_cctx *prev__cctx; 1478 coro_cctx *cctx_prev;
1349 1479
1350 if (expect_false (prev->flags & CF_NEW)) 1480 if (expect_false (prev->flags & CF_NEW))
1351 { 1481 {
1352 /* create a new empty/source context */ 1482 /* create a new empty/source context */
1353 prev->cctx = cctx_new_empty ();
1354 prev->flags &= ~CF_NEW; 1483 prev->flags &= ~CF_NEW;
1355 prev->flags |= CF_RUNNING; 1484 prev->flags |= CF_RUNNING;
1356 } 1485 }
1357 1486
1358 prev->flags &= ~CF_RUNNING; 1487 prev->flags &= ~CF_RUNNING;
… …
1369 coro_setup (aTHX_ next); 1498 coro_setup (aTHX_ next);
1370 } 1499 }
1371 else 1500 else
1372 load_perl (aTHX_ next); 1501 load_perl (aTHX_ next);
1373 1502
1374 prev__cctx = prev->cctx;
1375
1376 /* possibly untie and reuse the cctx */ 1503 /* possibly untie and reuse the cctx */
1377 if (expect_true ( 1504 if (expect_true (
1378 prev__cctx->idle_sp == STACKLEVEL 1505 cctx_current->idle_sp == STACKLEVEL
1379 && !(prev__cctx->flags & CC_TRACE) 1506 && !(cctx_current->flags & CC_TRACE)
1380 && !force_cctx 1507 && !force_cctx
1381 )) 1508 ))
1382 { 1509 {
1383 /* 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 */
1384 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));
1385 1512
1386 prev->cctx = 0;
1387
1388 /* 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. */
1389 /* 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 */
1390 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1515 if (expect_false (CCTX_EXPIRED (cctx_current)))
1391 if (!next->cctx) 1516 if (expect_true (!next->cctx))
1392 next->cctx = cctx_get (aTHX); 1517 next->cctx = cctx_get (aTHX);
1393 1518
1394 cctx_put (prev__cctx); 1519 cctx_put (cctx_current);
1395 } 1520 }
1521 else
1522 prev->cctx = cctx_current;
1396 1523
1397 ++next->usecount; 1524 ++next->usecount;
1398 1525
1399 if (expect_true (!next->cctx)) 1526 cctx_prev = cctx_current;
1400 next->cctx = cctx_get (aTHX); 1527 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1401 1528
1402 if (expect_false (prev__cctx != next->cctx)) 1529 next->cctx = 0;
1530
1531 if (expect_false (cctx_prev != cctx_current))
1403 { 1532 {
1404 prev__cctx->top_env = PL_top_env; 1533 cctx_prev->top_env = PL_top_env;
1405 PL_top_env = next->cctx->top_env; 1534 PL_top_env = cctx_current->top_env;
1406 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1535 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1407 } 1536 }
1408 1537
1409 transfer_tail (aTHX); 1538 transfer_tail (aTHX);
1410 } 1539 }
1411} 1540}
… …
1419coro_state_destroy (pTHX_ struct coro *coro) 1548coro_state_destroy (pTHX_ struct coro *coro)
1420{ 1549{
1421 if (coro->flags & CF_DESTROYED) 1550 if (coro->flags & CF_DESTROYED)
1422 return 0; 1551 return 0;
1423 1552
1424 if (coro->on_destroy) 1553 if (coro->on_destroy && !PL_dirty)
1425 coro->on_destroy (aTHX_ coro); 1554 coro->on_destroy (aTHX_ coro);
1426 1555
1427 coro->flags |= CF_DESTROYED; 1556 coro->flags |= CF_DESTROYED;
1428 1557
1429 if (coro->flags & CF_READY) 1558 if (coro->flags & CF_READY)
… …
1433 --coro_nready; 1562 --coro_nready;
1434 } 1563 }
1435 else 1564 else
1436 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 */
1437 1566
1438 if (coro->mainstack && coro->mainstack != main_mainstack) 1567 if (coro->mainstack
1439 { 1568 && coro->mainstack != main_mainstack
1440 struct coro temp; 1569 && coro->slot
1441 1570 && !PL_dirty)
1442 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1443
1444 save_perl (aTHX_ &temp);
1445 load_perl (aTHX_ coro);
1446
1447 coro_destruct (aTHX_ coro); 1571 coro_destruct_perl (aTHX_ coro);
1448
1449 load_perl (aTHX_ &temp);
1450
1451 coro->slot = 0;
1452 }
1453 1572
1454 cctx_destroy (coro->cctx); 1573 cctx_destroy (coro->cctx);
1455 SvREFCNT_dec (coro->startcv); 1574 SvREFCNT_dec (coro->startcv);
1456 SvREFCNT_dec (coro->args); 1575 SvREFCNT_dec (coro->args);
1457 SvREFCNT_dec (CORO_THROW); 1576 SvREFCNT_dec (CORO_THROW);
… …
1516 1635
1517 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1636 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1518 TRANSFER (ta, 1); 1637 TRANSFER (ta, 1);
1519} 1638}
1520 1639
1521/*****************************************************************************/
1522/* gensub: simple closure generation utility */
1523
1524#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1525
1526/* create a closure from XS, returns a code reference */
1527/* the arg can be accessed via GENSUB_ARG from the callback */
1528/* the callback must use dXSARGS/XSRETURN */
1529static SV *
1530gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1531{
1532 CV *cv = (CV *)newSV (0);
1533
1534 sv_upgrade ((SV *)cv, SVt_PVCV);
1535
1536 CvANON_on (cv);
1537 CvISXSUB_on (cv);
1538 CvXSUB (cv) = xsub;
1539 GENSUB_ARG = arg;
1540
1541 return newRV_noinc ((SV *)cv);
1542}
1543
1544/** Coro ********************************************************************/ 1640/** Coro ********************************************************************/
1545 1641
1546INLINE void 1642INLINE void
1547coro_enq (pTHX_ struct coro *coro) 1643coro_enq (pTHX_ struct coro *coro)
1548{ 1644{
1549 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1645 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1550}
1551 1646
1552INLINE 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 *
1553coro_deq (pTHX) 1655coro_deq (pTHX)
1554{ 1656{
1555 int prio; 1657 int prio;
1556 1658
1557 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1659 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1558 if (AvFILLp (coro_ready [prio]) >= 0) 1660 {
1559 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 }
1560 1670
1561 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;
1562} 1689}
1563 1690
1564static int 1691static int
1565api_ready (pTHX_ SV *coro_sv) 1692api_ready (pTHX_ SV *coro_sv)
1566{ 1693{
1567 struct coro *coro;
1568 SV *sv_hook;
1569 void (*xs_hook)(void);
1570
1571 if (SvROK (coro_sv))
1572 coro_sv = SvRV (coro_sv);
1573
1574 coro = SvSTATE (coro_sv); 1694 struct coro *coro = SvSTATE (coro_sv);
1575 1695
1576 if (coro->flags & CF_READY) 1696 if (coro->flags & CF_READY)
1577 return 0; 1697 return 0;
1578 1698
1579 coro->flags |= CF_READY; 1699 coro->flags |= CF_READY;
1580 1700
1581 sv_hook = coro_nready ? 0 : coro_readyhook;
1582 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1583
1584 coro_enq (aTHX_ coro); 1701 coro_enq (aTHX_ coro);
1585 ++coro_nready;
1586 1702
1587 if (sv_hook) 1703 if (!coro_nready++)
1588 { 1704 if (coroapi.readyhook)
1589 dSP; 1705 coroapi.readyhook ();
1590
1591 ENTER;
1592 SAVETMPS;
1593
1594 PUSHMARK (SP);
1595 PUTBACK;
1596 call_sv (sv_hook, G_VOID | G_DISCARD);
1597
1598 FREETMPS;
1599 LEAVE;
1600 }
1601
1602 if (xs_hook)
1603 xs_hook ();
1604 1706
1605 return 1; 1707 return 1;
1606} 1708}
1607 1709
1608static int 1710static int
1609api_is_ready (pTHX_ SV *coro_sv) 1711api_is_ready (pTHX_ SV *coro_sv)
1610{ 1712{
1611 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1713 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1612} 1714}
1613 1715
1716/* expects to own a reference to next->hv */
1614INLINE void 1717INLINE void
1615prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1718prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1616{ 1719{
1617 SV *prev_sv, *next_sv;
1618
1619 for (;;)
1620 {
1621 next_sv = coro_deq (aTHX);
1622
1623 /* nothing to schedule: call the idle handler */
1624 if (expect_false (!next_sv))
1625 {
1626 dSP;
1627
1628 ENTER;
1629 SAVETMPS;
1630
1631 PUSHMARK (SP);
1632 PUTBACK;
1633 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1634
1635 FREETMPS;
1636 LEAVE;
1637 continue;
1638 }
1639
1640 ta->next = SvSTATE_hv (next_sv);
1641
1642 /* cannot transfer to destroyed coros, skip and look for next */
1643 if (expect_false (ta->next->flags & CF_DESTROYED))
1644 {
1645 SvREFCNT_dec (next_sv);
1646 /* coro_nready has already been taken care of by destroy */
1647 continue;
1648 }
1649
1650 --coro_nready;
1651 break;
1652 }
1653
1654 /* free this only after the transfer */
1655 prev_sv = SvRV (coro_current); 1720 SV *prev_sv = SvRV (coro_current);
1721
1656 ta->prev = SvSTATE_hv (prev_sv); 1722 ta->prev = SvSTATE_hv (prev_sv);
1723 ta->next = next;
1724
1657 TRANSFER_CHECK (*ta); 1725 TRANSFER_CHECK (*ta);
1658 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1726
1659 ta->next->flags &= ~CF_READY;
1660 SvRV_set (coro_current, next_sv); 1727 SvRV_set (coro_current, (SV *)next->hv);
1661 1728
1662 free_coro_mortal (aTHX); 1729 free_coro_mortal (aTHX);
1663 coro_mortal = prev_sv; 1730 coro_mortal = prev_sv;
1664} 1731}
1665 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
1666INLINE void 1782INLINE void
1667prepare_cede (pTHX_ struct coro_transfer_args *ta) 1783prepare_cede (pTHX_ struct coro_transfer_args *ta)
1668{ 1784{
1669 api_ready (aTHX_ coro_current); 1785 api_ready (aTHX_ coro_current);
1670 prepare_schedule (aTHX_ ta); 1786 prepare_schedule (aTHX_ ta);
… …
1689{ 1805{
1690 struct coro_transfer_args ta; 1806 struct coro_transfer_args ta;
1691 1807
1692 prepare_schedule (aTHX_ &ta); 1808 prepare_schedule (aTHX_ &ta);
1693 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);
1694} 1820}
1695 1821
1696static int 1822static int
1697api_cede (pTHX) 1823api_cede (pTHX)
1698{ 1824{
… …
1727static void 1853static void
1728api_trace (pTHX_ SV *coro_sv, int flags) 1854api_trace (pTHX_ SV *coro_sv, int flags)
1729{ 1855{
1730 struct coro *coro = SvSTATE (coro_sv); 1856 struct coro *coro = SvSTATE (coro_sv);
1731 1857
1858 if (coro->flags & CF_RUNNING)
1859 croak ("cannot enable tracing on a running coroutine, caught");
1860
1732 if (flags & CC_TRACE) 1861 if (flags & CC_TRACE)
1733 { 1862 {
1734 if (!coro->cctx) 1863 if (!coro->cctx)
1735 coro->cctx = cctx_new_run (); 1864 coro->cctx = cctx_new_run ();
1736 else if (!(coro->cctx->flags & CC_TRACE)) 1865 else if (!(coro->cctx->flags & CC_TRACE))
1737 croak ("cannot enable tracing on coroutine with custom stack,"); 1866 croak ("cannot enable tracing on coroutine with custom stack, caught");
1738 1867
1739 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1868 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1740 } 1869 }
1741 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1870 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1742 { 1871 {
… …
1745 if (coro->flags & CF_RUNNING) 1874 if (coro->flags & CF_RUNNING)
1746 PL_runops = RUNOPS_DEFAULT; 1875 PL_runops = RUNOPS_DEFAULT;
1747 else 1876 else
1748 coro->slot->runops = RUNOPS_DEFAULT; 1877 coro->slot->runops = RUNOPS_DEFAULT;
1749 } 1878 }
1879}
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 /* items are actually not so common, so optimise for this case */
1922 if (items)
1923 {
1924 av_extend (av, items - 1);
1925
1926 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 }
1929
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1931
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager);
1934
1935 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat;
1937
1938 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/
1750} 1941}
1751 1942
1752/*****************************************************************************/ 1943/*****************************************************************************/
1753/* async pool handler */ 1944/* async pool handler */
1754 1945
… …
1832 2023
1833static void 2024static void
1834coro_rouse_callback (pTHX_ CV *cv) 2025coro_rouse_callback (pTHX_ CV *cv)
1835{ 2026{
1836 dXSARGS; 2027 dXSARGS;
1837 SV *data = (SV *)GENSUB_ARG; 2028 SV *data = (SV *)S_GENSUB_ARG;
1838 2029
1839 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2030 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1840 { 2031 {
1841 /* first call, set args */ 2032 /* first call, set args */
2033 SV *coro = SvRV (data);
1842 AV *av = newAV (); 2034 AV *av = newAV ();
1843 SV *coro = SvRV (data);
1844 2035
1845 SvRV_set (data, (SV *)av); 2036 SvRV_set (data, (SV *)av);
1846 api_ready (aTHX_ coro);
1847 SvREFCNT_dec (coro);
1848 2037
1849 /* better take a full copy of the arguments */ 2038 /* better take a full copy of the arguments */
1850 while (items--) 2039 while (items--)
1851 av_store (av, items, newSVsv (ST (items))); 2040 av_store (av, items, newSVsv (ST (items)));
2041
2042 api_ready (aTHX_ coro);
2043 SvREFCNT_dec (coro);
1852 } 2044 }
1853 2045
1854 XSRETURN_EMPTY; 2046 XSRETURN_EMPTY;
1855} 2047}
1856 2048
… …
1873 2065
1874 EXTEND (SP, AvFILLp (av) + 1); 2066 EXTEND (SP, AvFILLp (av) + 1);
1875 for (i = 0; i <= AvFILLp (av); ++i) 2067 for (i = 0; i <= AvFILLp (av); ++i)
1876 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2068 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1877 2069
1878 /* we have stolen the elements, so ste length to zero and free */ 2070 /* we have stolen the elements, so set length to zero and free */
1879 AvFILLp (av) = -1; 2071 AvFILLp (av) = -1;
1880 av_undef (av); 2072 av_undef (av);
1881 2073
1882 PUTBACK; 2074 PUTBACK;
1883 } 2075 }
… …
1907 || SvTYPE (SvRV (cb)) != SVt_PVCV 2099 || SvTYPE (SvRV (cb)) != SVt_PVCV
1908 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2100 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1909 croak ("Coro::rouse_wait called with illegal callback argument,"); 2101 croak ("Coro::rouse_wait called with illegal callback argument,");
1910 2102
1911 { 2103 {
1912 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2104 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1913 SV *data = (SV *)GENSUB_ARG; 2105 SV *data = (SV *)S_GENSUB_ARG;
1914 2106
1915 frame->data = (void *)data; 2107 frame->data = (void *)data;
1916 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2108 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1917 frame->check = slf_check_rouse_wait; 2109 frame->check = slf_check_rouse_wait;
1918 } 2110 }
… …
1922coro_new_rouse_cb (pTHX) 2114coro_new_rouse_cb (pTHX)
1923{ 2115{
1924 HV *hv = (HV *)SvRV (coro_current); 2116 HV *hv = (HV *)SvRV (coro_current);
1925 struct coro *coro = SvSTATE_hv (hv); 2117 struct coro *coro = SvSTATE_hv (hv);
1926 SV *data = newRV_inc ((SV *)hv); 2118 SV *data = newRV_inc ((SV *)hv);
1927 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2119 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1928 2120
1929 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2121 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1930 SvREFCNT_dec (data); /* magicext increases the refcount */ 2122 SvREFCNT_dec (data); /* magicext increases the refcount */
1931 2123
1932 SvREFCNT_dec (coro->rouse_cb); 2124 SvREFCNT_dec (coro->rouse_cb);
… …
1987static void 2179static void
1988slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2180slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1989{ 2181{
1990 frame->prepare = prepare_schedule; 2182 frame->prepare = prepare_schedule;
1991 frame->check = slf_check_nop; 2183 frame->check = slf_check_nop;
2184}
2185
2186static void
2187slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2188{
2189 struct coro *next = (struct coro *)slf_frame.data;
2190
2191 SvREFCNT_inc_NN (next->hv);
2192 prepare_schedule_to (aTHX_ ta, next);
2193}
2194
2195static void
2196slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2197{
2198 if (!items)
2199 croak ("Coro::schedule_to expects a coroutine argument, caught");
2200
2201 frame->data = (void *)SvSTATE (arg [0]);
2202 frame->prepare = slf_prepare_schedule_to;
2203 frame->check = slf_check_nop;
2204}
2205
2206static void
2207slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2208{
2209 api_ready (aTHX_ SvRV (coro_current));
2210
2211 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1992} 2212}
1993 2213
1994static void 2214static void
1995slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2215slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1996{ 2216{
… …
2142 } 2362 }
2143 else 2363 else
2144 slf_argc = 0; 2364 slf_argc = 0;
2145 2365
2146 PL_op->op_ppaddr = pp_slf; 2366 PL_op->op_ppaddr = pp_slf;
2147 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2367 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2148 2368
2149 PL_op = (OP *)&slf_restore; 2369 PL_op = (OP *)&slf_restore;
2370}
2371
2372/*****************************************************************************/
2373/* dynamic wind */
2374
2375static void
2376on_enterleave_call (pTHX_ SV *cb)
2377{
2378 dSP;
2379
2380 PUSHSTACK;
2381
2382 PUSHMARK (SP);
2383 PUTBACK;
2384 call_sv (cb, G_VOID | G_DISCARD);
2385 SPAGAIN;
2386
2387 POPSTACK;
2388}
2389
2390static SV *
2391coro_avp_pop_and_free (pTHX_ AV **avp)
2392{
2393 AV *av = *avp;
2394 SV *res = av_pop (av);
2395
2396 if (AvFILLp (av) < 0)
2397 {
2398 *avp = 0;
2399 SvREFCNT_dec (av);
2400 }
2401
2402 return res;
2403}
2404
2405static void
2406coro_pop_on_enter (pTHX_ void *coro)
2407{
2408 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2409 SvREFCNT_dec (cb);
2410}
2411
2412static void
2413coro_pop_on_leave (pTHX_ void *coro)
2414{
2415 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2416 on_enterleave_call (aTHX_ sv_2mortal (cb));
2150} 2417}
2151 2418
2152/*****************************************************************************/ 2419/*****************************************************************************/
2153/* PerlIO::cede */ 2420/* PerlIO::cede */
2154 2421
… …
2228/* Coro::Semaphore & Coro::Signal */ 2495/* Coro::Semaphore & Coro::Signal */
2229 2496
2230static SV * 2497static SV *
2231coro_waitarray_new (pTHX_ int count) 2498coro_waitarray_new (pTHX_ int count)
2232{ 2499{
2233 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2500 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2234 AV *av = newAV (); 2501 AV *av = newAV ();
2235 SV **ary; 2502 SV **ary;
2236 2503
2237 /* unfortunately, building manually saves memory */ 2504 /* unfortunately, building manually saves memory */
2238 Newx (ary, 2, SV *); 2505 Newx (ary, 2, SV *);
2239 AvALLOC (av) = ary; 2506 AvALLOC (av) = ary;
2507#if PERL_VERSION_ATLEAST (5,10,0)
2240 /*AvARRAY (av) = ary;*/ 2508 AvARRAY (av) = ary;
2509#else
2241 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2510 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2511 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2512 SvPVX ((SV *)av) = (char *)ary;
2513#endif
2242 AvMAX (av) = 1; 2514 AvMAX (av) = 1;
2243 AvFILLp (av) = 0; 2515 AvFILLp (av) = 0;
2244 ary [0] = newSViv (count); 2516 ary [0] = newSViv (count);
2245 2517
2246 return newRV_noinc ((SV *)av); 2518 return newRV_noinc ((SV *)av);
… …
2375{ 2647{
2376 if (items >= 2) 2648 if (items >= 2)
2377 { 2649 {
2378 /* callback form */ 2650 /* callback form */
2379 AV *av = (AV *)SvRV (arg [0]); 2651 AV *av = (AV *)SvRV (arg [0]);
2380 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2652 SV *cb_cv = s_get_cv_croak (arg [1]);
2381 2653
2382 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2654 av_push (av, SvREFCNT_inc_NN (cb_cv));
2383 2655
2384 if (SvIVX (AvARRAY (av)[0]) > 0) 2656 if (SvIVX (AvARRAY (av)[0]) > 0)
2385 coro_semaphore_adjust (aTHX_ av, 0); 2657 coro_semaphore_adjust (aTHX_ av, 0);
2386 2658
2387 frame->prepare = prepare_nop; 2659 frame->prepare = prepare_nop;
… …
2411 AvARRAY (av)[0] = AvARRAY (av)[1]; 2683 AvARRAY (av)[0] = AvARRAY (av)[1];
2412 AvARRAY (av)[1] = cb; 2684 AvARRAY (av)[1] = cb;
2413 2685
2414 cb = av_shift (av); 2686 cb = av_shift (av);
2415 2687
2688 if (SvTYPE (cb) == SVt_PVCV)
2689 {
2690 dSP;
2691 PUSHMARK (SP);
2692 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2693 PUTBACK;
2694 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2695 }
2696 else
2697 {
2416 api_ready (aTHX_ cb); 2698 api_ready (aTHX_ cb);
2417 sv_setiv (cb, 0); /* signal waiter */ 2699 sv_setiv (cb, 0); /* signal waiter */
2700 }
2701
2418 SvREFCNT_dec (cb); 2702 SvREFCNT_dec (cb);
2419 2703
2420 --count; 2704 --count;
2421 } 2705 }
2422} 2706}
… …
2431static void 2715static void
2432slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2716slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2433{ 2717{
2434 AV *av = (AV *)SvRV (arg [0]); 2718 AV *av = (AV *)SvRV (arg [0]);
2435 2719
2720 if (items >= 2)
2721 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724
2436 if (SvIVX (AvARRAY (av)[0])) 2725 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2727
2728 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop;
2730 }
2731 else if (SvIVX (AvARRAY (av)[0]))
2437 { 2732 {
2438 SvIVX (AvARRAY (av)[0]) = 0; 2733 SvIVX (AvARRAY (av)[0]) = 0;
2439 frame->prepare = prepare_nop; 2734 frame->prepare = prepare_nop;
2440 frame->check = slf_check_nop; 2735 frame->check = slf_check_nop;
2441 } 2736 }
2442 else 2737 else
2443 { 2738 {
2444 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2739 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2445 2740
2446 av_push (av, waiter); 2741 av_push (av, waiter);
2447 2742
2448 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2743 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2449 frame->prepare = prepare_schedule; 2744 frame->prepare = prepare_schedule;
… …
2467 2762
2468static void 2763static void
2469coro_aio_callback (pTHX_ CV *cv) 2764coro_aio_callback (pTHX_ CV *cv)
2470{ 2765{
2471 dXSARGS; 2766 dXSARGS;
2472 AV *state = (AV *)GENSUB_ARG; 2767 AV *state = (AV *)S_GENSUB_ARG;
2473 SV *coro = av_pop (state); 2768 SV *coro = av_pop (state);
2474 SV *data_sv = newSV (sizeof (struct io_state)); 2769 SV *data_sv = newSV (sizeof (struct io_state));
2475 2770
2476 av_extend (state, items - 1); 2771 av_extend (state, items - 1);
2477 2772
… …
2591 2886
2592 for (i = 0; i < items; ++i) 2887 for (i = 0; i < items; ++i)
2593 PUSHs (arg [i]); 2888 PUSHs (arg [i]);
2594 2889
2595 /* now push the callback closure */ 2890 /* now push the callback closure */
2596 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2891 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2597 2892
2598 /* now call the AIO function - we assume our request is uncancelable */ 2893 /* now call the AIO function - we assume our request is uncancelable */
2599 PUTBACK; 2894 PUTBACK;
2600 call_sv ((SV *)req, G_VOID | G_DISCARD); 2895 call_sv ((SV *)req, G_VOID | G_DISCARD);
2601 } 2896 }
… …
2615 2910
2616 XSRETURN_EMPTY; 2911 XSRETURN_EMPTY;
2617} 2912}
2618 2913
2619/*****************************************************************************/ 2914/*****************************************************************************/
2915
2916#if CORO_CLONE
2917# include "clone.c"
2918#endif
2919
2920/*****************************************************************************/
2921
2922static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro)
2924{
2925 SV *coro_sv;
2926 struct coro *coro;
2927 MAGIC *mg;
2928 HV *hv;
2929 SV *cb;
2930 int i;
2931
2932 if (argc > 0)
2933 {
2934 cb = s_get_cv_croak (argv [0]);
2935
2936 if (!is_coro)
2937 {
2938 if (CvISXSUB (cb))
2939 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2940
2941 if (!CvROOT (cb))
2942 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2943 }
2944 }
2945
2946 Newz (0, coro, 1, struct coro);
2947 coro->args = newAV ();
2948 coro->flags = CF_NEW;
2949
2950 if (coro_first) coro_first->prev = coro;
2951 coro->next = coro_first;
2952 coro_first = coro;
2953
2954 coro->hv = hv = newHV ();
2955 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2956 mg->mg_flags |= MGf_DUP;
2957 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
2958
2959 if (argc > 0)
2960 {
2961 av_extend (coro->args, argc + is_coro - 1);
2962
2963 if (is_coro)
2964 {
2965 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2966 cb = (SV *)cv_coro_run;
2967 }
2968
2969 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2970
2971 for (i = 1; i < argc; i++)
2972 av_push (coro->args, newSVsv (argv [i]));
2973 }
2974
2975 return coro_sv;
2976}
2620 2977
2621MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2978MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2622 2979
2623PROTOTYPES: DISABLE 2980PROTOTYPES: DISABLE
2624 2981
… …
2629 coro_thx = PERL_GET_CONTEXT; 2986 coro_thx = PERL_GET_CONTEXT;
2630# endif 2987# endif
2631#endif 2988#endif
2632 BOOT_PAGESIZE; 2989 BOOT_PAGESIZE;
2633 2990
2991 cctx_current = cctx_new_empty ();
2992
2634 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2993 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2635 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2994 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2636 2995
2637 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2996 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2638 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2997 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2657 3016
2658 { 3017 {
2659 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3018 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2660 3019
2661 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3020 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2662 hv_store_ent (PL_custom_op_names, slf, 3021 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2663 newSVpv ("coro_slf", 0), 0);
2664 3022
2665 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3023 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2666 hv_store_ent (PL_custom_op_descs, slf, 3024 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2667 newSVpv ("coro schedule like function", 0), 0);
2668 } 3025 }
2669 3026
2670 coroapi.ver = CORO_API_VERSION; 3027 coroapi.ver = CORO_API_VERSION;
2671 coroapi.rev = CORO_API_REVISION; 3028 coroapi.rev = CORO_API_REVISION;
2672 3029
… …
2684 3041
2685 if (!svp) croak ("Time::HiRes is required"); 3042 if (!svp) croak ("Time::HiRes is required");
2686 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2687 3044
2688 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2689 } 3049 }
2690 3050
2691 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2692} 3052}
2693 3053
2694SV * 3054SV *
2695new (char *klass, ...) 3055new (SV *klass, ...)
2696 ALIAS: 3056 ALIAS:
2697 Coro::new = 1 3057 Coro::new = 1
2698 CODE: 3058 CODE:
2699{ 3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2700 struct coro *coro; 3060 OUTPUT:
2701 MAGIC *mg;
2702 HV *hv;
2703 CV *cb;
2704 int i;
2705
2706 if (items > 1)
2707 {
2708 cb = coro_sv_2cv (aTHX_ ST (1));
2709
2710 if (!ix)
2711 {
2712 if (CvISXSUB (cb))
2713 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2714
2715 if (!CvROOT (cb))
2716 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2717 }
2718 }
2719
2720 Newz (0, coro, 1, struct coro);
2721 coro->args = newAV ();
2722 coro->flags = CF_NEW;
2723
2724 if (coro_first) coro_first->prev = coro;
2725 coro->next = coro_first;
2726 coro_first = coro;
2727
2728 coro->hv = hv = newHV ();
2729 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2730 mg->mg_flags |= MGf_DUP;
2731 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2732
2733 if (items > 1)
2734 {
2735 av_extend (coro->args, items - 1 + ix - 1);
2736
2737 if (ix)
2738 {
2739 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2740 cb = cv_coro_run;
2741 }
2742
2743 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2744
2745 for (i = 2; i < items; i++)
2746 av_push (coro->args, newSVsv (ST (i)));
2747 }
2748}
2749 OUTPUT:
2750 RETVAL 3061 RETVAL
2751 3062
2752void 3063void
2753transfer (...) 3064transfer (...)
2754 PROTOTYPE: $$ 3065 PROTOTYPE: $$
… …
2765void 3076void
2766_exit (int code) 3077_exit (int code)
2767 PROTOTYPE: $ 3078 PROTOTYPE: $
2768 CODE: 3079 CODE:
2769 _exit (code); 3080 _exit (code);
3081
3082SV *
3083clone (Coro::State coro)
3084 CODE:
3085{
3086#if CORO_CLONE
3087 struct coro *ncoro = coro_clone (aTHX_ coro);
3088 MAGIC *mg;
3089 /* TODO: too much duplication */
3090 ncoro->hv = newHV ();
3091 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3092 mg->mg_flags |= MGf_DUP;
3093 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3094#else
3095 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3096#endif
3097}
3098 OUTPUT:
3099 RETVAL
2770 3100
2771int 3101int
2772cctx_stacksize (int new_stacksize = 0) 3102cctx_stacksize (int new_stacksize = 0)
2773 PROTOTYPE: ;$ 3103 PROTOTYPE: ;$
2774 CODE: 3104 CODE:
… …
2824 eval = 1 3154 eval = 1
2825 CODE: 3155 CODE:
2826{ 3156{
2827 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2828 { 3158 {
2829 struct coro temp; 3159 struct coro *current = SvSTATE_current;
2830 3160
2831 if (!(coro->flags & CF_RUNNING)) 3161 if (current != coro)
2832 { 3162 {
2833 PUTBACK; 3163 PUTBACK;
2834 save_perl (aTHX_ &temp); 3164 save_perl (aTHX_ current);
2835 load_perl (aTHX_ coro); 3165 load_perl (aTHX_ coro);
3166 SPAGAIN;
2836 } 3167 }
2837 3168
2838 {
2839 dSP;
2840 ENTER;
2841 SAVETMPS;
2842 PUTBACK;
2843 PUSHSTACK; 3169 PUSHSTACK;
3170
2844 PUSHMARK (SP); 3171 PUSHMARK (SP);
3172 PUTBACK;
2845 3173
2846 if (ix) 3174 if (ix)
2847 eval_sv (coderef, 0); 3175 eval_sv (coderef, 0);
2848 else 3176 else
2849 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3177 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2850 3178
2851 POPSTACK; 3179 POPSTACK;
2852 SPAGAIN; 3180 SPAGAIN;
2853 FREETMPS;
2854 LEAVE;
2855 PUTBACK;
2856 }
2857 3181
2858 if (!(coro->flags & CF_RUNNING)) 3182 if (current != coro)
2859 { 3183 {
3184 PUTBACK;
2860 save_perl (aTHX_ coro); 3185 save_perl (aTHX_ coro);
2861 load_perl (aTHX_ &temp); 3186 load_perl (aTHX_ current);
2862 SPAGAIN; 3187 SPAGAIN;
2863 } 3188 }
2864 } 3189 }
2865} 3190}
2866 3191
… …
2870 ALIAS: 3195 ALIAS:
2871 is_ready = CF_READY 3196 is_ready = CF_READY
2872 is_running = CF_RUNNING 3197 is_running = CF_RUNNING
2873 is_new = CF_NEW 3198 is_new = CF_NEW
2874 is_destroyed = CF_DESTROYED 3199 is_destroyed = CF_DESTROYED
3200 is_suspended = CF_SUSPENDED
2875 CODE: 3201 CODE:
2876 RETVAL = boolSV (coro->flags & ix); 3202 RETVAL = boolSV (coro->flags & ix);
2877 OUTPUT: 3203 OUTPUT:
2878 RETVAL 3204 RETVAL
2879 3205
… …
2883 CODE: 3209 CODE:
2884{ 3210{
2885 struct coro *current = SvSTATE_current; 3211 struct coro *current = SvSTATE_current;
2886 SV **throwp = self == current ? &CORO_THROW : &self->except; 3212 SV **throwp = self == current ? &CORO_THROW : &self->except;
2887 SvREFCNT_dec (*throwp); 3213 SvREFCNT_dec (*throwp);
3214 SvGETMAGIC (throw);
2888 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2889} 3216}
2890 3217
2891void 3218void
2892api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2895 3222
2896SV * 3223SV *
2897has_cctx (Coro::State coro) 3224has_cctx (Coro::State coro)
2898 PROTOTYPE: $ 3225 PROTOTYPE: $
2899 CODE: 3226 CODE:
2900 RETVAL = boolSV (!!coro->cctx); 3227 /* maybe manage the running flag differently */
3228 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2901 OUTPUT: 3229 OUTPUT:
2902 RETVAL 3230 RETVAL
2903 3231
2904int 3232int
2905is_traced (Coro::State coro) 3233is_traced (Coro::State coro)
… …
2925 3253
2926void 3254void
2927force_cctx () 3255force_cctx ()
2928 PROTOTYPE: 3256 PROTOTYPE:
2929 CODE: 3257 CODE:
2930 SvSTATE_current->cctx->idle_sp = 0; 3258 cctx_current->idle_sp = 0;
2931 3259
2932void 3260void
2933swap_defsv (Coro::State self) 3261swap_defsv (Coro::State self)
2934 PROTOTYPE: $ 3262 PROTOTYPE: $
2935 ALIAS: 3263 ALIAS:
… …
2943 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3271 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2944 3272
2945 SV *tmp = *src; *src = *dst; *dst = tmp; 3273 SV *tmp = *src; *src = *dst; *dst = tmp;
2946 } 3274 }
2947 3275
3276void
3277cancel (Coro::State self)
3278 CODE:
3279 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282
3283SV *
3284enable_times (int enabled = enable_times)
3285 CODE:
3286{
3287 RETVAL = boolSV (enable_times);
3288
3289 if (enabled != enable_times)
3290 {
3291 enable_times = enabled;
3292
3293 coro_times_update ();
3294 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3295 }
3296}
3297 OUTPUT:
3298 RETVAL
3299
3300void
3301times (Coro::State self)
3302 PPCODE:
3303{
3304 struct coro *current = SvSTATE (coro_current);
3305
3306 if (expect_false (current == self))
3307 {
3308 coro_times_update ();
3309 coro_times_add (SvSTATE (coro_current));
3310 }
3311
3312 EXTEND (SP, 2);
3313 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315
3316 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current));
3318}
2948 3319
2949MODULE = Coro::State PACKAGE = Coro 3320MODULE = Coro::State PACKAGE = Coro
2950 3321
2951BOOT: 3322BOOT:
2952{ 3323{
2953 int i;
2954
2955 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2956 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3324 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2957 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3325 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2958 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3326 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2959 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD); 3327 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2960 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3328 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2961 SvREADONLY_on (coro_current); 3329 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3330 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3331 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2962 3333
2963 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2964 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2965 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2966 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2967 3338
2968 coro_stash = gv_stashpv ("Coro", TRUE); 3339 coro_stash = gv_stashpv ("Coro", TRUE);
2969 3340
2970 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2971 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2972 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2973 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3344 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2974 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3345 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2975 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3346 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2976
2977 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2978 coro_ready[i] = newAV ();
2979 3347
2980 { 3348 {
2981 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3349 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2982 3350
2983 coroapi.schedule = api_schedule; 3351 coroapi.schedule = api_schedule;
3352 coroapi.schedule_to = api_schedule_to;
2984 coroapi.cede = api_cede; 3353 coroapi.cede = api_cede;
2985 coroapi.cede_notself = api_cede_notself; 3354 coroapi.cede_notself = api_cede_notself;
2986 coroapi.ready = api_ready; 3355 coroapi.ready = api_ready;
2987 coroapi.is_ready = api_is_ready; 3356 coroapi.is_ready = api_is_ready;
2988 coroapi.nready = coro_nready; 3357 coroapi.nready = coro_nready;
… …
2992 sv_setiv (sv, (IV)&coroapi); 3361 sv_setiv (sv, (IV)&coroapi);
2993 SvREADONLY_on (sv); 3362 SvREADONLY_on (sv);
2994 } 3363 }
2995} 3364}
2996 3365
3366SV *
3367async (...)
3368 PROTOTYPE: &@
3369 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL);
3372 OUTPUT:
3373 RETVAL
3374
3375void
3376terminate (...)
3377 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3379
2997void 3380void
2998schedule (...) 3381schedule (...)
2999 CODE: 3382 CODE:
3000 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3383 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3384
3385void
3386schedule_to (...)
3387 CODE:
3388 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3389
3390void
3391cede_to (...)
3392 CODE:
3393 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3001 3394
3002void 3395void
3003cede (...) 3396cede (...)
3004 CODE: 3397 CODE:
3005 CORO_EXECUTE_SLF_XS (slf_init_cede); 3398 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3019void 3412void
3020_set_readyhook (SV *hook) 3413_set_readyhook (SV *hook)
3021 PROTOTYPE: $ 3414 PROTOTYPE: $
3022 CODE: 3415 CODE:
3023 SvREFCNT_dec (coro_readyhook); 3416 SvREFCNT_dec (coro_readyhook);
3417 SvGETMAGIC (hook);
3418 if (SvOK (hook))
3419 {
3024 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3420 coro_readyhook = newSVsv (hook);
3421 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3422 }
3423 else
3424 {
3425 coro_readyhook = 0;
3426 CORO_READYHOOK = 0;
3427 }
3025 3428
3026int 3429int
3027prio (Coro::State coro, int newprio = 0) 3430prio (Coro::State coro, int newprio = 0)
3028 PROTOTYPE: $;$ 3431 PROTOTYPE: $;$
3029 ALIAS: 3432 ALIAS:
… …
3035 if (items > 1) 3438 if (items > 1)
3036 { 3439 {
3037 if (ix) 3440 if (ix)
3038 newprio = coro->prio - newprio; 3441 newprio = coro->prio - newprio;
3039 3442
3040 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3443 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3041 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3444 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3042 3445
3043 coro->prio = newprio; 3446 coro->prio = newprio;
3044 } 3447 }
3045} 3448}
3046 OUTPUT: 3449 OUTPUT:
… …
3061 RETVAL = coro_nready; 3464 RETVAL = coro_nready;
3062 OUTPUT: 3465 OUTPUT:
3063 RETVAL 3466 RETVAL
3064 3467
3065void 3468void
3469suspend (Coro::State self)
3470 PROTOTYPE: $
3471 CODE:
3472 self->flags |= CF_SUSPENDED;
3473
3474void
3475resume (Coro::State self)
3476 PROTOTYPE: $
3477 CODE:
3478 self->flags &= ~CF_SUSPENDED;
3479
3480void
3066_pool_handler (...) 3481_pool_handler (...)
3067 CODE: 3482 CODE:
3068 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3483 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3069 3484
3070void 3485void
… …
3086 PUSHMARK (SP); 3501 PUSHMARK (SP);
3087 EXTEND (SP, 2); 3502 EXTEND (SP, 2);
3088 PUSHs (sv_Coro); 3503 PUSHs (sv_Coro);
3089 PUSHs ((SV *)cv_pool_handler); 3504 PUSHs ((SV *)cv_pool_handler);
3090 PUTBACK; 3505 PUTBACK;
3091 call_sv ((SV *)cv_coro_new, G_SCALAR); 3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3092 SPAGAIN; 3507 SPAGAIN;
3093 3508
3094 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3095 } 3510 }
3096 3511
… …
3123rouse_wait (...) 3538rouse_wait (...)
3124 PROTOTYPE: ;$ 3539 PROTOTYPE: ;$
3125 PPCODE: 3540 PPCODE:
3126 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3541 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3127 3542
3543void
3544on_enter (SV *block)
3545 ALIAS:
3546 on_leave = 1
3547 PROTOTYPE: &
3548 CODE:
3549{
3550 struct coro *coro = SvSTATE_current;
3551 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3552
3553 block = s_get_cv_croak (block);
3554
3555 if (!*avp)
3556 *avp = newAV ();
3557
3558 av_push (*avp, SvREFCNT_inc (block));
3559
3560 if (!ix)
3561 on_enterleave_call (aTHX_ block);
3562
3563 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3564 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3565 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3566}
3567
3128 3568
3129MODULE = Coro::State PACKAGE = PerlIO::cede 3569MODULE = Coro::State PACKAGE = PerlIO::cede
3130 3570
3131BOOT: 3571BOOT:
3132 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3572 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3135MODULE = Coro::State PACKAGE = Coro::Semaphore 3575MODULE = Coro::State PACKAGE = Coro::Semaphore
3136 3576
3137SV * 3577SV *
3138new (SV *klass, SV *count = 0) 3578new (SV *klass, SV *count = 0)
3139 CODE: 3579 CODE:
3580{
3581 int semcnt = 1;
3582
3583 if (count)
3584 {
3585 SvGETMAGIC (count);
3586
3587 if (SvOK (count))
3588 semcnt = SvIV (count);
3589 }
3590
3140 RETVAL = sv_bless ( 3591 RETVAL = sv_bless (
3141 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3592 coro_waitarray_new (aTHX_ semcnt),
3142 GvSTASH (CvGV (cv)) 3593 GvSTASH (CvGV (cv))
3143 ); 3594 );
3595}
3144 OUTPUT: 3596 OUTPUT:
3145 RETVAL 3597 RETVAL
3146 3598
3147# helper for Coro::Channel 3599# helper for Coro::Channel and others
3148SV * 3600SV *
3149_alloc (int count) 3601_alloc (int count)
3150 CODE: 3602 CODE:
3151 RETVAL = coro_waitarray_new (aTHX_ count); 3603 RETVAL = coro_waitarray_new (aTHX_ count);
3152 OUTPUT: 3604 OUTPUT:
… …
3210 for (i = 1; i <= wcount; ++i) 3662 for (i = 1; i <= wcount; ++i)
3211 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3663 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3212 } 3664 }
3213} 3665}
3214 3666
3667MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3668
3669void
3670_may_delete (SV *sem, int count, int extra_refs)
3671 PPCODE:
3672{
3673 AV *av = (AV *)SvRV (sem);
3674
3675 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3676 && AvFILLp (av) == 0 /* no waiters, just count */
3677 && SvIV (AvARRAY (av)[0]) == count)
3678 XSRETURN_YES;
3679
3680 XSRETURN_NO;
3681}
3682
3215MODULE = Coro::State PACKAGE = Coro::Signal 3683MODULE = Coro::State PACKAGE = Coro::Signal
3216 3684
3217SV * 3685SV *
3218new (SV *klass) 3686new (SV *klass)
3219 CODE: 3687 CODE:
… …
3290 3758
3291void 3759void
3292_register (char *target, char *proto, SV *req) 3760_register (char *target, char *proto, SV *req)
3293 CODE: 3761 CODE:
3294{ 3762{
3295 CV *req_cv = coro_sv_2cv (aTHX_ req); 3763 SV *req_cv = s_get_cv_croak (req);
3296 /* newXSproto doesn't return the CV on 5.8 */ 3764 /* newXSproto doesn't return the CV on 5.8 */
3297 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3765 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3298 sv_setpv ((SV *)slf_cv, proto); 3766 sv_setpv ((SV *)slf_cv, proto);
3299 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3767 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3300} 3768}
3301 3769
3770MODULE = Coro::State PACKAGE = Coro::Select
3771
3772void
3773patch_pp_sselect ()
3774 CODE:
3775 if (!coro_old_pp_sselect)
3776 {
3777 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3778 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3779 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3780 }
3781
3782void
3783unpatch_pp_sselect ()
3784 CODE:
3785 if (coro_old_pp_sselect)
3786 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0;
3789 }
3790
3791

Diff Legend

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