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.314 by root, Thu Nov 20 03:24:39 2008 UTC vs.
Revision 1.363 by root, Tue Jul 14 00:55:10 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#ifndef CvISXSUB
104# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
105#endif
106
107/* 5.8.7 */
108#ifndef SvRV_set
109# define SvRV_set(s,v) SvRV(s) = (v)
110#endif
111
112#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
113# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
114#endif 58#endif
115 59
116#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
… …
130#else 74#else
131# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
132# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
133#endif 77#endif
134 78
135#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
136 80
137#if __GNUC__ >= 3 81#if __GNUC__ >= 3
138# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
139# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
140# define INLINE static inline 84# define INLINE static inline
141#else 85#else
142# define attribute(x) 86# define attribute(x)
143# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
144# define INLINE static 88# define INLINE static
… …
156# if CORO_PTHREAD 100# if CORO_PTHREAD
157static void *coro_thx; 101static void *coro_thx;
158# endif 102# endif
159#endif 103#endif
160 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
161static 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]);
162 117
163/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
164#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
165static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
166 121
… …
170static AV *main_mainstack; /* used to differentiate between $main and others */ 125static AV *main_mainstack; /* used to differentiate between $main and others */
171static JMPENV *main_top_env; 126static JMPENV *main_top_env;
172static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
174 129
130static AV *av_destroy; /* destruction queue */
131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
133
175static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook; 136static SV *rv_diehook;
178static SV *rv_warnhook; 137static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */ 138static HV *hv_sig; /* %SIG */
180 139
181/* async_pool helper stuff */ 140/* async_pool helper stuff */
182static SV *sv_pool_rss; 141static SV *sv_pool_rss;
183static SV *sv_pool_size; 142static SV *sv_pool_size;
184static SV *sv_async_pool_idle; 143static SV *sv_async_pool_idle; /* description string */
185static AV *av_async_pool; 144static AV *av_async_pool; /* idle pool */
186static SV *sv_Coro; 145static SV *sv_Coro; /* class string */
187static CV *cv_pool_handler; 146static CV *cv_pool_handler;
188static CV *cv_coro_new; 147static CV *cv_coro_state_new;
189 148
190/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
191static 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;
192 157
193static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
194static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
195 160
196enum { 161enum {
… …
222 int valgrind_id; 187 int valgrind_id;
223#endif 188#endif
224 unsigned char flags; 189 unsigned char flags;
225} coro_cctx; 190} coro_cctx;
226 191
192coro_cctx *cctx_current; /* the currently running cctx */
193
194/*****************************************************************************/
195
227enum { 196enum {
228 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
229 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
230 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
231 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 */
232}; 202};
233 203
234/* 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 */
235typedef struct 205typedef struct
236{ 206{
237 SV *defsv; 207 SV *defsv;
238 AV *defav; 208 AV *defav;
239 SV *errsv; 209 SV *errsv;
240 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
241#define VAR(name,type) type name; 212#define VAR(name,type) type name;
242# include "state.h" 213# include "state.h"
243#undef VAR 214#undef VAR
244} perl_slots; 215} perl_slots;
245 216
… …
247 218
248/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
249struct coro { 220struct coro {
250 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
251 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
252 226
253 /* state data */ 227 /* state data */
254 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
255 AV *mainstack; 229 AV *mainstack;
256 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
… …
273 /* async_pool */ 247 /* async_pool */
274 SV *saved_deffh; 248 SV *saved_deffh;
275 SV *invoke_cb; 249 SV *invoke_cb;
276 AV *invoke_av; 250 AV *invoke_av;
277 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
278 /* linked list */ 259 /* linked list */
279 struct coro *next, *prev; 260 struct coro *next, *prev;
280}; 261};
281 262
282typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
… …
287/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
288static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
289 270
290/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
291 272
292#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
293#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
294#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
295#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
296#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
297#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
298 279
299/* for Coro.pm */ 280/* for Coro.pm */
300static SV *coro_current; 281static SV *coro_current;
301static SV *coro_readyhook; 282static SV *coro_readyhook;
302static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
303static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
304static struct coro *coro_first; 285static struct coro *coro_first;
305#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
306 287
307/** lowlevel stuff **********************************************************/ 288/** lowlevel stuff **********************************************************/
… …
334 get_hv (name, create); 315 get_hv (name, create);
335#endif 316#endif
336 return get_hv (name, create); 317 return get_hv (name, create);
337} 318}
338 319
339/* may croak */ 320INLINE void
340INLINE CV * 321coro_times_update ()
341coro_sv_2cv (pTHX_ SV *sv)
342{ 322{
323#ifdef coro_clock_gettime
324 struct timespec ts;
325
326 ts.tv_sec = ts.tv_nsec = 0;
327 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
328 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
329
330 ts.tv_sec = ts.tv_nsec = 0;
331 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
332 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
333#else
334 dTHX;
335 UV tv[2];
336
337 u2time (aTHX_ tv);
338 time_real [0] = tv [0];
339 time_real [1] = tv [1] * 1000;
340#endif
341}
342
343INLINE void
344coro_times_add (struct coro *c)
345{
346 c->t_real [1] += time_real [1];
347 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
348 c->t_real [0] += time_real [0];
349
350 c->t_cpu [1] += time_cpu [1];
351 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
352 c->t_cpu [0] += time_cpu [0];
353}
354
355INLINE void
356coro_times_sub (struct coro *c)
357{
358 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
359 c->t_real [1] -= time_real [1];
360 c->t_real [0] -= time_real [0];
361
362 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
363 c->t_cpu [1] -= time_cpu [1];
364 c->t_cpu [0] -= time_cpu [0];
365}
366
367/*****************************************************************************/
368/* magic glue */
369
370#define CORO_MAGIC_type_cv 26
371#define CORO_MAGIC_type_state PERL_MAGIC_ext
372
373#define CORO_MAGIC_NN(sv, type) \
374 (expect_true (SvMAGIC (sv)->mg_type == type) \
375 ? SvMAGIC (sv) \
376 : mg_find (sv, type))
377
378#define CORO_MAGIC(sv, type) \
379 (expect_true (SvMAGIC (sv)) \
380 ? CORO_MAGIC_NN (sv, type) \
381 : 0)
382
383#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
384#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
385
386INLINE struct coro *
387SvSTATE_ (pTHX_ SV *coro)
388{
343 HV *st; 389 HV *stash;
344 GV *gvp; 390 MAGIC *mg;
345 return sv_2cv (sv, &st, &gvp, 0); 391
392 if (SvROK (coro))
393 coro = SvRV (coro);
394
395 if (expect_false (SvTYPE (coro) != SVt_PVHV))
396 croak ("Coro::State object required");
397
398 stash = SvSTASH (coro);
399 if (expect_false (stash != coro_stash && stash != coro_state_stash))
400 {
401 /* very slow, but rare, check */
402 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
403 croak ("Coro::State object required");
404 }
405
406 mg = CORO_MAGIC_state (coro);
407 return (struct coro *)mg->mg_ptr;
346} 408}
409
410#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
411
412/* faster than SvSTATE, but expects a coroutine hv */
413#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
414#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
415
416/*****************************************************************************/
417/* padlist management and caching */
347 418
348static AV * 419static AV *
349coro_clone_padlist (pTHX_ CV *cv) 420coro_derive_padlist (pTHX_ CV *cv)
350{ 421{
351 AV *padlist = CvPADLIST (cv); 422 AV *padlist = CvPADLIST (cv);
352 AV *newpadlist, *newpad; 423 AV *newpadlist, *newpad;
353 424
354 newpadlist = newAV (); 425 newpadlist = newAV ();
… …
359 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 430 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
360#endif 431#endif
361 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 432 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
362 --AvFILLp (padlist); 433 --AvFILLp (padlist);
363 434
364 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 435 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
365 av_store (newpadlist, 1, (SV *)newpad); 436 av_store (newpadlist, 1, (SV *)newpad);
366 437
367 return newpadlist; 438 return newpadlist;
368} 439}
369 440
370static void 441static void
371free_padlist (pTHX_ AV *padlist) 442free_padlist (pTHX_ AV *padlist)
372{ 443{
373 /* may be during global destruction */ 444 /* may be during global destruction */
374 if (SvREFCNT (padlist)) 445 if (!IN_DESTRUCT)
375 { 446 {
376 I32 i = AvFILLp (padlist); 447 I32 i = AvFILLp (padlist);
377 while (i >= 0) 448
449 while (i > 0) /* special-case index 0 */
378 { 450 {
379 SV **svp = av_fetch (padlist, i--, FALSE); 451 /* we try to be extra-careful here */
380 if (svp) 452 AV *av = (AV *)AvARRAY (padlist)[i--];
381 { 453 I32 j = AvFILLp (av);
382 SV *sv; 454
383 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 455 while (j >= 0)
456 SvREFCNT_dec (AvARRAY (av)[j--]);
457
458 AvFILLp (av) = -1;
384 SvREFCNT_dec (sv); 459 SvREFCNT_dec (av);
385
386 SvREFCNT_dec (*svp);
387 }
388 } 460 }
389 461
462 SvREFCNT_dec (AvARRAY (padlist)[0]);
463
464 AvFILLp (padlist) = -1;
390 SvREFCNT_dec ((SV*)padlist); 465 SvREFCNT_dec ((SV*)padlist);
391 } 466 }
392} 467}
393 468
394static int 469static int
395coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 470coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
396{ 471{
397 AV *padlist; 472 AV *padlist;
398 AV *av = (AV *)mg->mg_obj; 473 AV *av = (AV *)mg->mg_obj;
474
475 /* perl manages to free our internal AV and _then_ call us */
476 if (IN_DESTRUCT)
477 return 0;
399 478
400 /* casting is fun. */ 479 /* casting is fun. */
401 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
402 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
403 482
404 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 483 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
405 484
406 return 0; 485 return 0;
407} 486}
408
409#define CORO_MAGIC_type_cv 26
410#define CORO_MAGIC_type_state PERL_MAGIC_ext
411 487
412static MGVTBL coro_cv_vtbl = { 488static MGVTBL coro_cv_vtbl = {
413 0, 0, 0, 0, 489 0, 0, 0, 0,
414 coro_cv_free 490 coro_cv_free
415}; 491};
416
417#define CORO_MAGIC_NN(sv, type) \
418 (expect_true (SvMAGIC (sv)->mg_type == type) \
419 ? SvMAGIC (sv) \
420 : mg_find (sv, type))
421
422#define CORO_MAGIC(sv, type) \
423 (expect_true (SvMAGIC (sv)) \
424 ? CORO_MAGIC_NN (sv, type) \
425 : 0)
426
427#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
428#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
429
430INLINE struct coro *
431SvSTATE_ (pTHX_ SV *coro)
432{
433 HV *stash;
434 MAGIC *mg;
435
436 if (SvROK (coro))
437 coro = SvRV (coro);
438
439 if (expect_false (SvTYPE (coro) != SVt_PVHV))
440 croak ("Coro::State object required");
441
442 stash = SvSTASH (coro);
443 if (expect_false (stash != coro_stash && stash != coro_state_stash))
444 {
445 /* very slow, but rare, check */
446 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
447 croak ("Coro::State object required");
448 }
449
450 mg = CORO_MAGIC_state (coro);
451 return (struct coro *)mg->mg_ptr;
452}
453
454#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
455
456/* faster than SvSTATE, but expects a coroutine hv */
457#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
458#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
459 492
460/* the next two functions merely cache the padlists */ 493/* the next two functions merely cache the padlists */
461static void 494static void
462get_padlist (pTHX_ CV *cv) 495get_padlist (pTHX_ CV *cv)
463{ 496{
… …
474 CV *cp = Perl_cv_clone (aTHX_ cv); 507 CV *cp = Perl_cv_clone (aTHX_ cv);
475 CvPADLIST (cv) = CvPADLIST (cp); 508 CvPADLIST (cv) = CvPADLIST (cp);
476 CvPADLIST (cp) = 0; 509 CvPADLIST (cp) = 0;
477 SvREFCNT_dec (cp); 510 SvREFCNT_dec (cp);
478#else 511#else
479 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 512 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
480#endif 513#endif
481 } 514 }
482} 515}
483 516
484static void 517static void
… …
491 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 524 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
492 525
493 av = (AV *)mg->mg_obj; 526 av = (AV *)mg->mg_obj;
494 527
495 if (expect_false (AvFILLp (av) >= AvMAX (av))) 528 if (expect_false (AvFILLp (av) >= AvMAX (av)))
496 av_extend (av, AvMAX (av) + 1); 529 av_extend (av, AvFILLp (av) + 1);
497 530
498 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 531 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
499} 532}
500 533
501/** load & save, init *******************************************************/ 534/** load & save, init *******************************************************/
535
536static void
537on_enterleave_call (pTHX_ SV *cb);
502 538
503static void 539static void
504load_perl (pTHX_ Coro__State c) 540load_perl (pTHX_ Coro__State c)
505{ 541{
506 perl_slots *slot = c->slot; 542 perl_slots *slot = c->slot;
507 c->slot = 0; 543 c->slot = 0;
508 544
509 PL_mainstack = c->mainstack; 545 PL_mainstack = c->mainstack;
510 546
511 GvSV (PL_defgv) = slot->defsv; 547 GvSV (PL_defgv) = slot->defsv;
512 GvAV (PL_defgv) = slot->defav; 548 GvAV (PL_defgv) = slot->defav;
513 GvSV (PL_errgv) = slot->errsv; 549 GvSV (PL_errgv) = slot->errsv;
514 GvSV (irsgv) = slot->irsgv; 550 GvSV (irsgv) = slot->irsgv;
551 GvHV (PL_hintgv) = slot->hinthv;
515 552
516 #define VAR(name,type) PL_ ## name = slot->name; 553 #define VAR(name,type) PL_ ## name = slot->name;
517 # include "state.h" 554 # include "state.h"
518 #undef VAR 555 #undef VAR
519 556
… …
533 PUTBACK; 570 PUTBACK;
534 } 571 }
535 572
536 slf_frame = c->slf_frame; 573 slf_frame = c->slf_frame;
537 CORO_THROW = c->except; 574 CORO_THROW = c->except;
575
576 if (expect_false (enable_times))
577 {
578 if (expect_false (!times_valid))
579 coro_times_update ();
580
581 coro_times_sub (c);
582 }
583
584 if (expect_false (c->on_enter))
585 {
586 int i;
587
588 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
589 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
590 }
538} 591}
539 592
540static void 593static void
541save_perl (pTHX_ Coro__State c) 594save_perl (pTHX_ Coro__State c)
542{ 595{
596 if (expect_false (c->on_leave))
597 {
598 int i;
599
600 for (i = AvFILLp (c->on_leave); i >= 0; --i)
601 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
602 }
603
604 times_valid = 0;
605
606 if (expect_false (enable_times))
607 {
608 coro_times_update (); times_valid = 1;
609 coro_times_add (c);
610 }
611
543 c->except = CORO_THROW; 612 c->except = CORO_THROW;
544 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
545 614
546 { 615 {
547 dSP; 616 dSP;
… …
560 { 629 {
561 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
562 { 631 {
563 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
564 633
565 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 634 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
566 { 635 {
567 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
568 637
569 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
570 { 639 {
… …
594 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
595 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
596 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
597 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
598 { 667 {
599 int i; 668 unsigned int i;
600 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
601 CXINC; 670 CXINC;
602 } 671 }
603 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
604 673
605 c->mainstack = PL_mainstack; 674 c->mainstack = PL_mainstack;
606 675
607 { 676 {
608 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
609 678
610 slot->defav = GvAV (PL_defgv); 679 slot->defav = GvAV (PL_defgv);
611 slot->defsv = DEFSV; 680 slot->defsv = DEFSV;
612 slot->errsv = ERRSV; 681 slot->errsv = ERRSV;
613 slot->irsgv = GvSV (irsgv); 682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
614 684
615 #define VAR(name,type) slot->name = PL_ ## name; 685 #define VAR(name,type) slot->name = PL_ ## name;
616 # include "state.h" 686 # include "state.h"
617 #undef VAR 687 #undef VAR
618 } 688 }
… …
745#endif 815#endif
746 816
747/* 817/*
748 * This overrides the default magic get method of %SIG elements. 818 * This overrides the default magic get method of %SIG elements.
749 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 819 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
750 * and instead of tryign to save and restore the hash elements, we just provide 820 * and instead of trying to save and restore the hash elements, we just provide
751 * readback here. 821 * readback here.
752 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
753 * not expecting this to actually change the hook. This is a potential problem
754 * when a schedule happens then, but we ignore this.
755 */ 822 */
756static int 823static int
757coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
758{ 825{
759 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
… …
812 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
813 880
814 if (svp) 881 if (svp)
815 { 882 {
816 SV *old = *svp; 883 SV *old = *svp;
817 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
818 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
819 return 0; 886 return 0;
820 } 887 }
821 } 888 }
822 889
… …
832 899
833static int 900static int
834slf_check_nop (pTHX_ struct CoroSLF *frame) 901slf_check_nop (pTHX_ struct CoroSLF *frame)
835{ 902{
836 return 0; 903 return 0;
904}
905
906static int
907slf_check_repeat (pTHX_ struct CoroSLF *frame)
908{
909 return 1;
837} 910}
838 911
839static UNOP coro_setup_op; 912static UNOP coro_setup_op;
840 913
841static void NOINLINE /* noinline to keep it out of the transfer fast path */ 914static void NOINLINE /* noinline to keep it out of the transfer fast path */
… …
848 921
849 PL_runops = RUNOPS_DEFAULT; 922 PL_runops = RUNOPS_DEFAULT;
850 PL_curcop = &PL_compiling; 923 PL_curcop = &PL_compiling;
851 PL_in_eval = EVAL_NULL; 924 PL_in_eval = EVAL_NULL;
852 PL_comppad = 0; 925 PL_comppad = 0;
926 PL_comppad_name = 0;
927 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0;
853 PL_curpm = 0; 929 PL_curpm = 0;
854 PL_curpad = 0; 930 PL_curpad = 0;
855 PL_localizing = 0; 931 PL_localizing = 0;
856 PL_dirty = 0; 932 PL_dirty = 0;
857 PL_restartop = 0; 933 PL_restartop = 0;
858#if PERL_VERSION_ATLEAST (5,10,0) 934#if PERL_VERSION_ATLEAST (5,10,0)
859 PL_parser = 0; 935 PL_parser = 0;
860#endif 936#endif
937 PL_hints = 0;
861 938
862 /* recreate the die/warn hooks */ 939 /* recreate the die/warn hooks */
863 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 940 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
864 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 941 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
865 942
866 GvSV (PL_defgv) = newSV (0); 943 GvSV (PL_defgv) = newSV (0);
867 GvAV (PL_defgv) = coro->args; coro->args = 0; 944 GvAV (PL_defgv) = coro->args; coro->args = 0;
868 GvSV (PL_errgv) = newSV (0); 945 GvSV (PL_errgv) = newSV (0);
869 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 946 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
947 GvHV (PL_hintgv) = 0;
870 PL_rs = newSVsv (GvSV (irsgv)); 948 PL_rs = newSVsv (GvSV (irsgv));
871 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
872 950
873 { 951 {
874 dSP; 952 dSP;
… …
892 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 970 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
893 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 971 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
894 972
895 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 973 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
896 coro_setup_op.op_next = PL_op; 974 coro_setup_op.op_next = PL_op;
897 coro_setup_op.op_type = OP_CUSTOM; 975 coro_setup_op.op_type = OP_ENTERSUB;
898 coro_setup_op.op_ppaddr = pp_slf; 976 coro_setup_op.op_ppaddr = pp_slf;
899 /* no flags etc. required, as an init function won't be called */ 977 /* no flags etc. required, as an init function won't be called */
900 978
901 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
902 980
903 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
904 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
905}
906 983
984 if (expect_false (enable_times))
985 {
986 coro_times_update ();
987 coro_times_sub (coro);
988 }
989}
990
907static void 991static void
908coro_destruct (pTHX_ struct coro *coro) 992coro_unwind_stacks (pTHX)
909{ 993{
910 if (!IN_DESTRUCT) 994 if (!IN_DESTRUCT)
911 { 995 {
912 /* restore all saved variables and stuff */ 996 /* restore all saved variables and stuff */
913 LEAVE_SCOPE (0); 997 LEAVE_SCOPE (0);
… …
921 POPSTACK_TO (PL_mainstack); 1005 POPSTACK_TO (PL_mainstack);
922 1006
923 /* unwind main stack */ 1007 /* unwind main stack */
924 dounwind (-1); 1008 dounwind (-1);
925 } 1009 }
1010}
926 1011
927 SvREFCNT_dec (GvSV (PL_defgv)); 1012static void
928 SvREFCNT_dec (GvAV (PL_defgv)); 1013coro_destruct_perl (pTHX_ struct coro *coro)
929 SvREFCNT_dec (GvSV (PL_errgv)); 1014{
930 SvREFCNT_dec (PL_defoutgv); 1015 SV *svf [9];
931 SvREFCNT_dec (PL_rs);
932 SvREFCNT_dec (GvSV (irsgv));
933 1016
934 SvREFCNT_dec (PL_diehook);
935 SvREFCNT_dec (PL_warnhook);
936 1017 {
1018 struct coro *current = SvSTATE_current;
1019
1020 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1021
1022 save_perl (aTHX_ current);
1023 load_perl (aTHX_ coro);
1024
1025 coro_unwind_stacks (aTHX);
1026 coro_destruct_stacks (aTHX);
1027
1028 // now save some sv's to be free'd later
1029 svf [0] = GvSV (PL_defgv);
1030 svf [1] = (SV *)GvAV (PL_defgv);
1031 svf [2] = GvSV (PL_errgv);
1032 svf [3] = (SV *)PL_defoutgv;
1033 svf [4] = PL_rs;
1034 svf [5] = GvSV (irsgv);
1035 svf [6] = (SV *)GvHV (PL_hintgv);
1036 svf [7] = PL_diehook;
1037 svf [8] = PL_warnhook;
1038 assert (9 == sizeof (svf) / sizeof (*svf));
1039
1040 load_perl (aTHX_ current);
1041 }
1042
1043 {
1044 unsigned int i;
1045
1046 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1047 SvREFCNT_dec (svf [i]);
1048
937 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
938 SvREFCNT_dec (coro->rouse_cb); 1050 SvREFCNT_dec (coro->rouse_cb);
939 SvREFCNT_dec (coro->invoke_cb); 1051 SvREFCNT_dec (coro->invoke_cb);
940 SvREFCNT_dec (coro->invoke_av); 1052 SvREFCNT_dec (coro->invoke_av);
941 1053 }
942 coro_destruct_stacks (aTHX);
943} 1054}
944 1055
945INLINE void 1056INLINE void
946free_coro_mortal (pTHX) 1057free_coro_mortal (pTHX)
947{ 1058{
… …
955static int 1066static int
956runops_trace (pTHX) 1067runops_trace (pTHX)
957{ 1068{
958 COP *oldcop = 0; 1069 COP *oldcop = 0;
959 int oldcxix = -2; 1070 int oldcxix = -2;
960 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
961 coro_cctx *cctx = coro->cctx;
962 1071
963 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1072 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
964 { 1073 {
965 PERL_ASYNC_CHECK (); 1074 PERL_ASYNC_CHECK ();
966 1075
967 if (cctx->flags & CC_TRACE_ALL) 1076 if (cctx_current->flags & CC_TRACE_ALL)
968 { 1077 {
969 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1078 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
970 { 1079 {
971 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1080 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
972 SV **bot, **top; 1081 SV **bot, **top;
973 AV *av = newAV (); /* return values */ 1082 AV *av = newAV (); /* return values */
974 SV **cb; 1083 SV **cb;
… …
1011 1120
1012 if (PL_curcop != &PL_compiling) 1121 if (PL_curcop != &PL_compiling)
1013 { 1122 {
1014 SV **cb; 1123 SV **cb;
1015 1124
1016 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1125 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1017 { 1126 {
1018 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1127 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1019 1128
1020 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1129 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1021 { 1130 {
1022 runops_proc_t old_runops = PL_runops;
1023 dSP; 1131 dSP;
1024 GV *gv = CvGV (cx->blk_sub.cv); 1132 GV *gv = CvGV (cx->blk_sub.cv);
1025 SV *fullname = sv_2mortal (newSV (0)); 1133 SV *fullname = sv_2mortal (newSV (0));
1026 1134
1027 if (isGV (gv)) 1135 if (isGV (gv))
… …
1045 } 1153 }
1046 1154
1047 oldcxix = cxstack_ix; 1155 oldcxix = cxstack_ix;
1048 } 1156 }
1049 1157
1050 if (cctx->flags & CC_TRACE_LINE) 1158 if (cctx_current->flags & CC_TRACE_LINE)
1051 { 1159 {
1052 dSP; 1160 dSP;
1053 1161
1054 PL_runops = RUNOPS_DEFAULT; 1162 PL_runops = RUNOPS_DEFAULT;
1055 ENTER; 1163 ENTER;
… …
1074 1182
1075 TAINT_NOT; 1183 TAINT_NOT;
1076 return 0; 1184 return 0;
1077} 1185}
1078 1186
1079static struct coro_cctx *cctx_ssl_cctx;
1080static struct CoroSLF cctx_ssl_frame; 1187static struct CoroSLF cctx_ssl_frame;
1081 1188
1082static void 1189static void
1083slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1190slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1084{ 1191{
1085 ta->prev = (struct coro *)cctx_ssl_cctx;
1086 ta->next = 0; 1192 ta->prev = 0;
1087} 1193}
1088 1194
1089static int 1195static int
1090slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1196slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1091{ 1197{
… …
1094 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1200 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1095} 1201}
1096 1202
1097/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1203/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1098static void NOINLINE 1204static void NOINLINE
1099cctx_prepare (pTHX_ coro_cctx *cctx) 1205cctx_prepare (pTHX)
1100{ 1206{
1101 PL_top_env = &PL_start_env; 1207 PL_top_env = &PL_start_env;
1102 1208
1103 if (cctx->flags & CC_TRACE) 1209 if (cctx_current->flags & CC_TRACE)
1104 PL_runops = runops_trace; 1210 PL_runops = runops_trace;
1105 1211
1106 /* we already must be executing an SLF op, there is no other valid way 1212 /* we already must be executing an SLF op, there is no other valid way
1107 * that can lead to creation of a new cctx */ 1213 * that can lead to creation of a new cctx */
1108 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1214 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1109 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1215 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1110 1216
1111 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1217 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1112 cctx_ssl_cctx = cctx;
1113 cctx_ssl_frame = slf_frame; 1218 cctx_ssl_frame = slf_frame;
1114 1219
1115 slf_frame.prepare = slf_prepare_set_stacklevel; 1220 slf_frame.prepare = slf_prepare_set_stacklevel;
1116 slf_frame.check = slf_check_set_stacklevel; 1221 slf_frame.check = slf_check_set_stacklevel;
1117} 1222}
… …
1140 /* normally we would need to skip the entersub here */ 1245 /* normally we would need to skip the entersub here */
1141 /* not doing so will re-execute it, which is exactly what we want */ 1246 /* not doing so will re-execute it, which is exactly what we want */
1142 /* PL_nop = PL_nop->op_next */ 1247 /* PL_nop = PL_nop->op_next */
1143 1248
1144 /* inject a fake subroutine call to cctx_init */ 1249 /* inject a fake subroutine call to cctx_init */
1145 cctx_prepare (aTHX_ (coro_cctx *)arg); 1250 cctx_prepare (aTHX);
1146 1251
1147 /* cctx_run is the alternative tail of transfer() */ 1252 /* cctx_run is the alternative tail of transfer() */
1148 transfer_tail (aTHX); 1253 transfer_tail (aTHX);
1149 1254
1150 /* somebody or something will hit me for both perl_run and PL_restartop */ 1255 /* somebody or something will hit me for both perl_run and PL_restartop */
… …
1158 /* 1263 /*
1159 * If perl-run returns we assume exit() was being called or the coro 1264 * If perl-run returns we assume exit() was being called or the coro
1160 * fell off the end, which seems to be the only valid (non-bug) 1265 * fell off the end, which seems to be the only valid (non-bug)
1161 * reason for perl_run to return. We try to exit by jumping to the 1266 * reason for perl_run to return. We try to exit by jumping to the
1162 * bootstrap-time "top" top_env, as we cannot restore the "main" 1267 * bootstrap-time "top" top_env, as we cannot restore the "main"
1163 * coroutine as Coro has no such concept 1268 * coroutine as Coro has no such concept.
1269 * This actually isn't valid with the pthread backend, but OSes requiring
1270 * that backend are too broken to do it in a standards-compliant way.
1164 */ 1271 */
1165 PL_top_env = main_top_env; 1272 PL_top_env = main_top_env;
1166 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1273 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1167 } 1274 }
1168} 1275}
… …
1245cctx_destroy (coro_cctx *cctx) 1352cctx_destroy (coro_cctx *cctx)
1246{ 1353{
1247 if (!cctx) 1354 if (!cctx)
1248 return; 1355 return;
1249 1356
1357 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1358
1250 --cctx_count; 1359 --cctx_count;
1251 coro_destroy (&cctx->cctx); 1360 coro_destroy (&cctx->cctx);
1252 1361
1253 /* coro_transfer creates new, empty cctx's */ 1362 /* coro_transfer creates new, empty cctx's */
1254 if (cctx->sptr) 1363 if (cctx->sptr)
… …
1317 /* TODO: throwing up here is considered harmful */ 1426 /* TODO: throwing up here is considered harmful */
1318 1427
1319 if (expect_true (prev != next)) 1428 if (expect_true (prev != next))
1320 { 1429 {
1321 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1430 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1322 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1431 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1323 1432
1324 if (expect_false (next->flags & CF_RUNNING))
1325 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1326
1327 if (expect_false (next->flags & CF_DESTROYED)) 1433 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1328 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1434 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1329 1435
1330#if !PERL_VERSION_ATLEAST (5,10,0) 1436#if !PERL_VERSION_ATLEAST (5,10,0)
1331 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1437 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1332 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1438 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1333#endif 1439#endif
… …
1339transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1445transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1340{ 1446{
1341 dSTACKLEVEL; 1447 dSTACKLEVEL;
1342 1448
1343 /* sometimes transfer is only called to set idle_sp */ 1449 /* sometimes transfer is only called to set idle_sp */
1344 if (expect_false (!next)) 1450 if (expect_false (!prev))
1345 { 1451 {
1346 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1452 cctx_current->idle_sp = STACKLEVEL;
1347 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1453 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1348 } 1454 }
1349 else if (expect_true (prev != next)) 1455 else if (expect_true (prev != next))
1350 { 1456 {
1351 coro_cctx *prev__cctx; 1457 coro_cctx *cctx_prev;
1352 1458
1353 if (expect_false (prev->flags & CF_NEW)) 1459 if (expect_false (prev->flags & CF_NEW))
1354 { 1460 {
1355 /* create a new empty/source context */ 1461 /* create a new empty/source context */
1356 prev->cctx = cctx_new_empty ();
1357 prev->flags &= ~CF_NEW; 1462 prev->flags &= ~CF_NEW;
1358 prev->flags |= CF_RUNNING; 1463 prev->flags |= CF_RUNNING;
1359 } 1464 }
1360 1465
1361 prev->flags &= ~CF_RUNNING; 1466 prev->flags &= ~CF_RUNNING;
… …
1372 coro_setup (aTHX_ next); 1477 coro_setup (aTHX_ next);
1373 } 1478 }
1374 else 1479 else
1375 load_perl (aTHX_ next); 1480 load_perl (aTHX_ next);
1376 1481
1377 prev__cctx = prev->cctx;
1378
1379 /* possibly untie and reuse the cctx */ 1482 /* possibly untie and reuse the cctx */
1380 if (expect_true ( 1483 if (expect_true (
1381 prev__cctx->idle_sp == STACKLEVEL 1484 cctx_current->idle_sp == STACKLEVEL
1382 && !(prev__cctx->flags & CC_TRACE) 1485 && !(cctx_current->flags & CC_TRACE)
1383 && !force_cctx 1486 && !force_cctx
1384 )) 1487 ))
1385 { 1488 {
1386 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1489 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1387 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1490 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1388 1491
1389 prev->cctx = 0;
1390
1391 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1492 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1392 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1493 /* without this the next cctx_get might destroy the running cctx while still in use */
1393 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1494 if (expect_false (CCTX_EXPIRED (cctx_current)))
1394 if (!next->cctx) 1495 if (expect_true (!next->cctx))
1395 next->cctx = cctx_get (aTHX); 1496 next->cctx = cctx_get (aTHX);
1396 1497
1397 cctx_put (prev__cctx); 1498 cctx_put (cctx_current);
1398 } 1499 }
1500 else
1501 prev->cctx = cctx_current;
1399 1502
1400 ++next->usecount; 1503 ++next->usecount;
1401 1504
1402 if (expect_true (!next->cctx)) 1505 cctx_prev = cctx_current;
1403 next->cctx = cctx_get (aTHX); 1506 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1404 1507
1405 if (expect_false (prev__cctx != next->cctx)) 1508 next->cctx = 0;
1509
1510 if (expect_false (cctx_prev != cctx_current))
1406 { 1511 {
1407 prev__cctx->top_env = PL_top_env; 1512 cctx_prev->top_env = PL_top_env;
1408 PL_top_env = next->cctx->top_env; 1513 PL_top_env = cctx_current->top_env;
1409 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1514 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1410 } 1515 }
1411 1516
1412 transfer_tail (aTHX); 1517 transfer_tail (aTHX);
1413 } 1518 }
1414} 1519}
… …
1422coro_state_destroy (pTHX_ struct coro *coro) 1527coro_state_destroy (pTHX_ struct coro *coro)
1423{ 1528{
1424 if (coro->flags & CF_DESTROYED) 1529 if (coro->flags & CF_DESTROYED)
1425 return 0; 1530 return 0;
1426 1531
1427 if (coro->on_destroy) 1532 if (coro->on_destroy && !PL_dirty)
1428 coro->on_destroy (aTHX_ coro); 1533 coro->on_destroy (aTHX_ coro);
1429 1534
1430 coro->flags |= CF_DESTROYED; 1535 coro->flags |= CF_DESTROYED;
1431 1536
1432 if (coro->flags & CF_READY) 1537 if (coro->flags & CF_READY)
… …
1436 --coro_nready; 1541 --coro_nready;
1437 } 1542 }
1438 else 1543 else
1439 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1544 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1440 1545
1441 if (coro->mainstack && coro->mainstack != main_mainstack) 1546 if (coro->mainstack
1442 { 1547 && coro->mainstack != main_mainstack
1443 struct coro temp; 1548 && coro->slot
1444 1549 && !PL_dirty)
1445 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1446
1447 save_perl (aTHX_ &temp);
1448 load_perl (aTHX_ coro);
1449
1450 coro_destruct (aTHX_ coro); 1550 coro_destruct_perl (aTHX_ coro);
1451
1452 load_perl (aTHX_ &temp);
1453
1454 coro->slot = 0;
1455 }
1456 1551
1457 cctx_destroy (coro->cctx); 1552 cctx_destroy (coro->cctx);
1458 SvREFCNT_dec (coro->startcv); 1553 SvREFCNT_dec (coro->startcv);
1459 SvREFCNT_dec (coro->args); 1554 SvREFCNT_dec (coro->args);
1460 SvREFCNT_dec (CORO_THROW); 1555 SvREFCNT_dec (CORO_THROW);
… …
1519 1614
1520 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1615 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1521 TRANSFER (ta, 1); 1616 TRANSFER (ta, 1);
1522} 1617}
1523 1618
1524/*****************************************************************************/
1525/* gensub: simple closure generation utility */
1526
1527#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1528
1529/* create a closure from XS, returns a code reference */
1530/* the arg can be accessed via GENSUB_ARG from the callback */
1531/* the callback must use dXSARGS/XSRETURN */
1532static SV *
1533gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1534{
1535 CV *cv = (CV *)newSV (0);
1536
1537 sv_upgrade ((SV *)cv, SVt_PVCV);
1538
1539 CvANON_on (cv);
1540 CvISXSUB_on (cv);
1541 CvXSUB (cv) = xsub;
1542 GENSUB_ARG = arg;
1543
1544 return newRV_noinc ((SV *)cv);
1545}
1546
1547/** Coro ********************************************************************/ 1619/** Coro ********************************************************************/
1548 1620
1549INLINE void 1621INLINE void
1550coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1551{ 1623{
1552 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1553}
1554 1625
1555INLINE SV * 1626 SvREFCNT_inc_NN (coro->hv);
1627
1628 coro->next_ready = 0;
1629 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1630 ready [1] = coro;
1631}
1632
1633INLINE struct coro *
1556coro_deq (pTHX) 1634coro_deq (pTHX)
1557{ 1635{
1558 int prio; 1636 int prio;
1559 1637
1560 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1561 if (AvFILLp (coro_ready [prio]) >= 0) 1639 {
1562 return av_shift (coro_ready [prio]); 1640 struct coro **ready = coro_ready [prio];
1641
1642 if (ready [0])
1643 {
1644 struct coro *coro = ready [0];
1645 ready [0] = coro->next_ready;
1646 return coro;
1647 }
1648 }
1563 1649
1564 return 0; 1650 return 0;
1565} 1651}
1566 1652
1567static int 1653static int
… …
1569{ 1655{
1570 struct coro *coro; 1656 struct coro *coro;
1571 SV *sv_hook; 1657 SV *sv_hook;
1572 void (*xs_hook)(void); 1658 void (*xs_hook)(void);
1573 1659
1574 if (SvROK (coro_sv))
1575 coro_sv = SvRV (coro_sv);
1576
1577 coro = SvSTATE (coro_sv); 1660 coro = SvSTATE (coro_sv);
1578 1661
1579 if (coro->flags & CF_READY) 1662 if (coro->flags & CF_READY)
1580 return 0; 1663 return 0;
1581 1664
… …
1612api_is_ready (pTHX_ SV *coro_sv) 1695api_is_ready (pTHX_ SV *coro_sv)
1613{ 1696{
1614 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1697 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1615} 1698}
1616 1699
1700/* expects to own a reference to next->hv */
1617INLINE void 1701INLINE void
1618prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1702prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1619{ 1703{
1620 SV *prev_sv, *next_sv;
1621
1622 for (;;)
1623 {
1624 next_sv = coro_deq (aTHX);
1625
1626 /* nothing to schedule: call the idle handler */
1627 if (expect_false (!next_sv))
1628 {
1629 dSP;
1630
1631 ENTER;
1632 SAVETMPS;
1633
1634 PUSHMARK (SP);
1635 PUTBACK;
1636 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1637
1638 FREETMPS;
1639 LEAVE;
1640 continue;
1641 }
1642
1643 ta->next = SvSTATE_hv (next_sv);
1644
1645 /* cannot transfer to destroyed coros, skip and look for next */
1646 if (expect_false (ta->next->flags & CF_DESTROYED))
1647 {
1648 SvREFCNT_dec (next_sv);
1649 /* coro_nready has already been taken care of by destroy */
1650 continue;
1651 }
1652
1653 --coro_nready;
1654 break;
1655 }
1656
1657 /* free this only after the transfer */
1658 prev_sv = SvRV (coro_current); 1704 SV *prev_sv = SvRV (coro_current);
1705
1659 ta->prev = SvSTATE_hv (prev_sv); 1706 ta->prev = SvSTATE_hv (prev_sv);
1707 ta->next = next;
1708
1660 TRANSFER_CHECK (*ta); 1709 TRANSFER_CHECK (*ta);
1661 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1710
1662 ta->next->flags &= ~CF_READY;
1663 SvRV_set (coro_current, next_sv); 1711 SvRV_set (coro_current, (SV *)next->hv);
1664 1712
1665 free_coro_mortal (aTHX); 1713 free_coro_mortal (aTHX);
1666 coro_mortal = prev_sv; 1714 coro_mortal = prev_sv;
1667} 1715}
1668 1716
1717static void
1718prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1719{
1720 for (;;)
1721 {
1722 struct coro *next = coro_deq (aTHX);
1723
1724 if (expect_true (next))
1725 {
1726 /* cannot transfer to destroyed coros, skip and look for next */
1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1729 else
1730 {
1731 next->flags &= ~CF_READY;
1732 --coro_nready;
1733
1734 prepare_schedule_to (aTHX_ ta, next);
1735 break;
1736 }
1737 }
1738 else
1739 {
1740 /* nothing to schedule: call the idle handler */
1741 if (SvROK (sv_idle)
1742 && SvOBJECT (SvRV (sv_idle)))
1743 {
1744 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1745 api_ready (aTHX_ SvRV (sv_idle));
1746 --coro_nready;
1747 }
1748 else
1749 {
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (sv_idle, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1761 }
1762 }
1763 }
1764}
1765
1669INLINE void 1766INLINE void
1670prepare_cede (pTHX_ struct coro_transfer_args *ta) 1767prepare_cede (pTHX_ struct coro_transfer_args *ta)
1671{ 1768{
1672 api_ready (aTHX_ coro_current); 1769 api_ready (aTHX_ coro_current);
1673 prepare_schedule (aTHX_ ta); 1770 prepare_schedule (aTHX_ ta);
… …
1692{ 1789{
1693 struct coro_transfer_args ta; 1790 struct coro_transfer_args ta;
1694 1791
1695 prepare_schedule (aTHX_ &ta); 1792 prepare_schedule (aTHX_ &ta);
1696 TRANSFER (ta, 1); 1793 TRANSFER (ta, 1);
1794}
1795
1796static void
1797api_schedule_to (pTHX_ SV *coro_sv)
1798{
1799 struct coro_transfer_args ta;
1800 struct coro *next = SvSTATE (coro_sv);
1801
1802 SvREFCNT_inc_NN (coro_sv);
1803 prepare_schedule_to (aTHX_ &ta, next);
1697} 1804}
1698 1805
1699static int 1806static int
1700api_cede (pTHX) 1807api_cede (pTHX)
1701{ 1808{
… …
1730static void 1837static void
1731api_trace (pTHX_ SV *coro_sv, int flags) 1838api_trace (pTHX_ SV *coro_sv, int flags)
1732{ 1839{
1733 struct coro *coro = SvSTATE (coro_sv); 1840 struct coro *coro = SvSTATE (coro_sv);
1734 1841
1842 if (coro->flags & CF_RUNNING)
1843 croak ("cannot enable tracing on a running coroutine, caught");
1844
1735 if (flags & CC_TRACE) 1845 if (flags & CC_TRACE)
1736 { 1846 {
1737 if (!coro->cctx) 1847 if (!coro->cctx)
1738 coro->cctx = cctx_new_run (); 1848 coro->cctx = cctx_new_run ();
1739 else if (!(coro->cctx->flags & CC_TRACE)) 1849 else if (!(coro->cctx->flags & CC_TRACE))
1740 croak ("cannot enable tracing on coroutine with custom stack,"); 1850 croak ("cannot enable tracing on coroutine with custom stack, caught");
1741 1851
1742 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1852 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1743 } 1853 }
1744 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1854 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1745 { 1855 {
… …
1748 if (coro->flags & CF_RUNNING) 1858 if (coro->flags & CF_RUNNING)
1749 PL_runops = RUNOPS_DEFAULT; 1859 PL_runops = RUNOPS_DEFAULT;
1750 else 1860 else
1751 coro->slot->runops = RUNOPS_DEFAULT; 1861 coro->slot->runops = RUNOPS_DEFAULT;
1752 } 1862 }
1863}
1864
1865static void
1866coro_call_on_destroy (pTHX_ struct coro *coro)
1867{
1868 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1869 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1870
1871 if (on_destroyp)
1872 {
1873 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1874
1875 while (AvFILLp (on_destroy) >= 0)
1876 {
1877 dSP; /* don't disturb outer sp */
1878 SV *cb = av_pop (on_destroy);
1879
1880 PUSHMARK (SP);
1881
1882 if (statusp)
1883 {
1884 int i;
1885 AV *status = (AV *)SvRV (*statusp);
1886 EXTEND (SP, AvFILLp (status) + 1);
1887
1888 for (i = 0; i <= AvFILLp (status); ++i)
1889 PUSHs (AvARRAY (status)[i]);
1890 }
1891
1892 PUTBACK;
1893 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1894 }
1895 }
1896}
1897
1898static void
1899slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1900{
1901 int i;
1902 HV *hv = (HV *)SvRV (coro_current);
1903 AV *av = newAV ();
1904
1905 av_extend (av, items - 1);
1906 for (i = 0; i < items; ++i)
1907 av_push (av, SvREFCNT_inc_NN (arg [i]));
1908
1909 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
1910
1911 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1912 api_ready (aTHX_ sv_manager);
1913
1914 frame->prepare = prepare_schedule;
1915 frame->check = slf_check_repeat;
1916
1917 /* as a minor optimisation, we could unwind all stacks here */
1918 /* but that puts extra pressure on pp_slf, and is not worth much */
1919 /*coro_unwind_stacks (aTHX);*/
1753} 1920}
1754 1921
1755/*****************************************************************************/ 1922/*****************************************************************************/
1756/* async pool handler */ 1923/* async pool handler */
1757 1924
… …
1835 2002
1836static void 2003static void
1837coro_rouse_callback (pTHX_ CV *cv) 2004coro_rouse_callback (pTHX_ CV *cv)
1838{ 2005{
1839 dXSARGS; 2006 dXSARGS;
1840 SV *data = (SV *)GENSUB_ARG; 2007 SV *data = (SV *)S_GENSUB_ARG;
1841 2008
1842 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1843 { 2010 {
1844 /* first call, set args */ 2011 /* first call, set args */
2012 SV *coro = SvRV (data);
1845 AV *av = newAV (); 2013 AV *av = newAV ();
1846 SV *coro = SvRV (data);
1847 2014
1848 SvRV_set (data, (SV *)av); 2015 SvRV_set (data, (SV *)av);
1849 api_ready (aTHX_ coro);
1850 SvREFCNT_dec (coro);
1851 2016
1852 /* better take a full copy of the arguments */ 2017 /* better take a full copy of the arguments */
1853 while (items--) 2018 while (items--)
1854 av_store (av, items, newSVsv (ST (items))); 2019 av_store (av, items, newSVsv (ST (items)));
2020
2021 api_ready (aTHX_ coro);
2022 SvREFCNT_dec (coro);
1855 } 2023 }
1856 2024
1857 XSRETURN_EMPTY; 2025 XSRETURN_EMPTY;
1858} 2026}
1859 2027
… …
1876 2044
1877 EXTEND (SP, AvFILLp (av) + 1); 2045 EXTEND (SP, AvFILLp (av) + 1);
1878 for (i = 0; i <= AvFILLp (av); ++i) 2046 for (i = 0; i <= AvFILLp (av); ++i)
1879 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2047 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1880 2048
1881 /* we have stolen the elements, so ste length to zero and free */ 2049 /* we have stolen the elements, so set length to zero and free */
1882 AvFILLp (av) = -1; 2050 AvFILLp (av) = -1;
1883 av_undef (av); 2051 av_undef (av);
1884 2052
1885 PUTBACK; 2053 PUTBACK;
1886 } 2054 }
… …
1910 || SvTYPE (SvRV (cb)) != SVt_PVCV 2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
1911 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1912 croak ("Coro::rouse_wait called with illegal callback argument,"); 2080 croak ("Coro::rouse_wait called with illegal callback argument,");
1913 2081
1914 { 2082 {
1915 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1916 SV *data = (SV *)GENSUB_ARG; 2084 SV *data = (SV *)S_GENSUB_ARG;
1917 2085
1918 frame->data = (void *)data; 2086 frame->data = (void *)data;
1919 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1920 frame->check = slf_check_rouse_wait; 2088 frame->check = slf_check_rouse_wait;
1921 } 2089 }
… …
1925coro_new_rouse_cb (pTHX) 2093coro_new_rouse_cb (pTHX)
1926{ 2094{
1927 HV *hv = (HV *)SvRV (coro_current); 2095 HV *hv = (HV *)SvRV (coro_current);
1928 struct coro *coro = SvSTATE_hv (hv); 2096 struct coro *coro = SvSTATE_hv (hv);
1929 SV *data = newRV_inc ((SV *)hv); 2097 SV *data = newRV_inc ((SV *)hv);
1930 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1931 2099
1932 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2100 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1933 SvREFCNT_dec (data); /* magicext increases the refcount */ 2101 SvREFCNT_dec (data); /* magicext increases the refcount */
1934 2102
1935 SvREFCNT_dec (coro->rouse_cb); 2103 SvREFCNT_dec (coro->rouse_cb);
… …
1990static void 2158static void
1991slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2159slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1992{ 2160{
1993 frame->prepare = prepare_schedule; 2161 frame->prepare = prepare_schedule;
1994 frame->check = slf_check_nop; 2162 frame->check = slf_check_nop;
2163}
2164
2165static void
2166slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2167{
2168 struct coro *next = (struct coro *)slf_frame.data;
2169
2170 SvREFCNT_inc_NN (next->hv);
2171 prepare_schedule_to (aTHX_ ta, next);
2172}
2173
2174static void
2175slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2176{
2177 if (!items)
2178 croak ("Coro::schedule_to expects a coroutine argument, caught");
2179
2180 frame->data = (void *)SvSTATE (arg [0]);
2181 frame->prepare = slf_prepare_schedule_to;
2182 frame->check = slf_check_nop;
2183}
2184
2185static void
2186slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2187{
2188 api_ready (aTHX_ SvRV (coro_current));
2189
2190 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1995} 2191}
1996 2192
1997static void 2193static void
1998slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2194slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1999{ 2195{
… …
2145 } 2341 }
2146 else 2342 else
2147 slf_argc = 0; 2343 slf_argc = 0;
2148 2344
2149 PL_op->op_ppaddr = pp_slf; 2345 PL_op->op_ppaddr = pp_slf;
2150 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2346 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2151 2347
2152 PL_op = (OP *)&slf_restore; 2348 PL_op = (OP *)&slf_restore;
2349}
2350
2351/*****************************************************************************/
2352/* dynamic wind */
2353
2354static void
2355on_enterleave_call (pTHX_ SV *cb)
2356{
2357 dSP;
2358
2359 PUSHSTACK;
2360
2361 PUSHMARK (SP);
2362 PUTBACK;
2363 call_sv (cb, G_VOID | G_DISCARD);
2364 SPAGAIN;
2365
2366 POPSTACK;
2367}
2368
2369static SV *
2370coro_avp_pop_and_free (pTHX_ AV **avp)
2371{
2372 AV *av = *avp;
2373 SV *res = av_pop (av);
2374
2375 if (AvFILLp (av) < 0)
2376 {
2377 *avp = 0;
2378 SvREFCNT_dec (av);
2379 }
2380
2381 return res;
2382}
2383
2384static void
2385coro_pop_on_enter (pTHX_ void *coro)
2386{
2387 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2388 SvREFCNT_dec (cb);
2389}
2390
2391static void
2392coro_pop_on_leave (pTHX_ void *coro)
2393{
2394 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2395 on_enterleave_call (aTHX_ sv_2mortal (cb));
2153} 2396}
2154 2397
2155/*****************************************************************************/ 2398/*****************************************************************************/
2156/* PerlIO::cede */ 2399/* PerlIO::cede */
2157 2400
… …
2231/* Coro::Semaphore & Coro::Signal */ 2474/* Coro::Semaphore & Coro::Signal */
2232 2475
2233static SV * 2476static SV *
2234coro_waitarray_new (pTHX_ int count) 2477coro_waitarray_new (pTHX_ int count)
2235{ 2478{
2236 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2479 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2237 AV *av = newAV (); 2480 AV *av = newAV ();
2238 SV **ary; 2481 SV **ary;
2239 2482
2240 /* unfortunately, building manually saves memory */ 2483 /* unfortunately, building manually saves memory */
2241 Newx (ary, 2, SV *); 2484 Newx (ary, 2, SV *);
2242 AvALLOC (av) = ary; 2485 AvALLOC (av) = ary;
2486#if PERL_VERSION_ATLEAST (5,10,0)
2243 /*AvARRAY (av) = ary;*/ 2487 AvARRAY (av) = ary;
2488#else
2244 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2489 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2490 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2491 SvPVX ((SV *)av) = (char *)ary;
2492#endif
2245 AvMAX (av) = 1; 2493 AvMAX (av) = 1;
2246 AvFILLp (av) = 0; 2494 AvFILLp (av) = 0;
2247 ary [0] = newSViv (count); 2495 ary [0] = newSViv (count);
2248 2496
2249 return newRV_noinc ((SV *)av); 2497 return newRV_noinc ((SV *)av);
… …
2378{ 2626{
2379 if (items >= 2) 2627 if (items >= 2)
2380 { 2628 {
2381 /* callback form */ 2629 /* callback form */
2382 AV *av = (AV *)SvRV (arg [0]); 2630 AV *av = (AV *)SvRV (arg [0]);
2383 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2384 2632
2385 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2386 2634
2387 if (SvIVX (AvARRAY (av)[0]) > 0) 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2388 coro_semaphore_adjust (aTHX_ av, 0); 2636 coro_semaphore_adjust (aTHX_ av, 0);
2389 2637
2390 frame->prepare = prepare_nop; 2638 frame->prepare = prepare_nop;
… …
2414 AvARRAY (av)[0] = AvARRAY (av)[1]; 2662 AvARRAY (av)[0] = AvARRAY (av)[1];
2415 AvARRAY (av)[1] = cb; 2663 AvARRAY (av)[1] = cb;
2416 2664
2417 cb = av_shift (av); 2665 cb = av_shift (av);
2418 2666
2667 if (SvTYPE (cb) == SVt_PVCV)
2668 {
2669 dSP;
2670 PUSHMARK (SP);
2671 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2672 PUTBACK;
2673 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2674 }
2675 else
2676 {
2419 api_ready (aTHX_ cb); 2677 api_ready (aTHX_ cb);
2420 sv_setiv (cb, 0); /* signal waiter */ 2678 sv_setiv (cb, 0); /* signal waiter */
2679 }
2680
2421 SvREFCNT_dec (cb); 2681 SvREFCNT_dec (cb);
2422 2682
2423 --count; 2683 --count;
2424 } 2684 }
2425} 2685}
… …
2434static void 2694static void
2435slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2695slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2436{ 2696{
2437 AV *av = (AV *)SvRV (arg [0]); 2697 AV *av = (AV *)SvRV (arg [0]);
2438 2698
2699 if (items >= 2)
2700 {
2701 SV *cb_cv = s_get_cv_croak (arg [1]);
2702 av_push (av, SvREFCNT_inc_NN (cb_cv));
2703
2439 if (SvIVX (AvARRAY (av)[0])) 2704 if (SvIVX (AvARRAY (av)[0]))
2705 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */
2706
2707 frame->prepare = prepare_nop;
2708 frame->check = slf_check_nop;
2709 }
2710 else if (SvIVX (AvARRAY (av)[0]))
2440 { 2711 {
2441 SvIVX (AvARRAY (av)[0]) = 0; 2712 SvIVX (AvARRAY (av)[0]) = 0;
2442 frame->prepare = prepare_nop; 2713 frame->prepare = prepare_nop;
2443 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2444 } 2715 }
2445 else 2716 else
2446 { 2717 {
2447 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2718 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2448 2719
2449 av_push (av, waiter); 2720 av_push (av, waiter);
2450 2721
2451 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2722 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2452 frame->prepare = prepare_schedule; 2723 frame->prepare = prepare_schedule;
… …
2470 2741
2471static void 2742static void
2472coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2473{ 2744{
2474 dXSARGS; 2745 dXSARGS;
2475 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2476 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2477 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2478 2749
2479 av_extend (state, items - 1); 2750 av_extend (state, items - 1);
2480 2751
… …
2594 2865
2595 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2596 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2597 2868
2598 /* now push the callback closure */ 2869 /* now push the callback closure */
2599 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2870 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2600 2871
2601 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2602 PUTBACK; 2873 PUTBACK;
2603 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2604 } 2875 }
… …
2618 2889
2619 XSRETURN_EMPTY; 2890 XSRETURN_EMPTY;
2620} 2891}
2621 2892
2622/*****************************************************************************/ 2893/*****************************************************************************/
2894
2895#if CORO_CLONE
2896# include "clone.c"
2897#endif
2623 2898
2624MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2899MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2625 2900
2626PROTOTYPES: DISABLE 2901PROTOTYPES: DISABLE
2627 2902
… …
2632 coro_thx = PERL_GET_CONTEXT; 2907 coro_thx = PERL_GET_CONTEXT;
2633# endif 2908# endif
2634#endif 2909#endif
2635 BOOT_PAGESIZE; 2910 BOOT_PAGESIZE;
2636 2911
2912 cctx_current = cctx_new_empty ();
2913
2637 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2914 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2638 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2915 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2639 2916
2640 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 2917 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2641 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 2918 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2660 2937
2661 { 2938 {
2662 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 2939 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2663 2940
2664 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 2941 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2665 hv_store_ent (PL_custom_op_names, slf, 2942 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2666 newSVpv ("coro_slf", 0), 0);
2667 2943
2668 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 2944 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2669 hv_store_ent (PL_custom_op_descs, slf, 2945 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2670 newSVpv ("coro schedule like function", 0), 0);
2671 } 2946 }
2672 2947
2673 coroapi.ver = CORO_API_VERSION; 2948 coroapi.ver = CORO_API_VERSION;
2674 coroapi.rev = CORO_API_REVISION; 2949 coroapi.rev = CORO_API_REVISION;
2675 2950
… …
2687 2962
2688 if (!svp) croak ("Time::HiRes is required"); 2963 if (!svp) croak ("Time::HiRes is required");
2689 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2690 2965
2691 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 2966 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2967
2968 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
2969 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2692 } 2970 }
2693 2971
2694 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2695} 2973}
2696 2974
2697SV * 2975SV *
2698new (char *klass, ...) 2976new (char *klass, ...)
2699 ALIAS: 2977 ALIAS:
… …
2701 CODE: 2979 CODE:
2702{ 2980{
2703 struct coro *coro; 2981 struct coro *coro;
2704 MAGIC *mg; 2982 MAGIC *mg;
2705 HV *hv; 2983 HV *hv;
2706 CV *cb; 2984 SV *cb;
2707 int i; 2985 int i;
2708 2986
2709 if (items > 1) 2987 if (items > 1)
2710 { 2988 {
2711 cb = coro_sv_2cv (aTHX_ ST (1)); 2989 cb = s_get_cv_croak (ST (1));
2712 2990
2713 if (!ix) 2991 if (!ix)
2714 { 2992 {
2715 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
2716 croak ("Coro::State doesn't support XS functions as coroutine start, caught"); 2994 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
… …
2738 av_extend (coro->args, items - 1 + ix - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
2739 3017
2740 if (ix) 3018 if (ix)
2741 { 3019 {
2742 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2743 cb = cv_coro_run; 3021 cb = (SV *)cv_coro_run;
2744 } 3022 }
2745 3023
2746 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2747 3025
2748 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
… …
2768void 3046void
2769_exit (int code) 3047_exit (int code)
2770 PROTOTYPE: $ 3048 PROTOTYPE: $
2771 CODE: 3049 CODE:
2772 _exit (code); 3050 _exit (code);
3051
3052SV *
3053clone (Coro::State coro)
3054 CODE:
3055{
3056#if CORO_CLONE
3057 struct coro *ncoro = coro_clone (aTHX_ coro);
3058 MAGIC *mg;
3059 /* TODO: too much duplication */
3060 ncoro->hv = newHV ();
3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3062 mg->mg_flags |= MGf_DUP;
3063 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3064#else
3065 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3066#endif
3067}
3068 OUTPUT:
3069 RETVAL
2773 3070
2774int 3071int
2775cctx_stacksize (int new_stacksize = 0) 3072cctx_stacksize (int new_stacksize = 0)
2776 PROTOTYPE: ;$ 3073 PROTOTYPE: ;$
2777 CODE: 3074 CODE:
… …
2827 eval = 1 3124 eval = 1
2828 CODE: 3125 CODE:
2829{ 3126{
2830 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2831 { 3128 {
2832 struct coro temp; 3129 struct coro *current = SvSTATE_current;
2833 3130
2834 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
2835 { 3132 {
2836 PUTBACK; 3133 PUTBACK;
2837 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
2838 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
2839 } 3137 }
2840 3138
2841 {
2842 dSP;
2843 ENTER;
2844 SAVETMPS;
2845 PUTBACK;
2846 PUSHSTACK; 3139 PUSHSTACK;
3140
2847 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
2848 3143
2849 if (ix) 3144 if (ix)
2850 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
2851 else 3146 else
2852 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2853 3148
2854 POPSTACK; 3149 POPSTACK;
2855 SPAGAIN; 3150 SPAGAIN;
2856 FREETMPS;
2857 LEAVE;
2858 PUTBACK;
2859 }
2860 3151
2861 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
2862 { 3153 {
3154 PUTBACK;
2863 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
2864 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
2865 SPAGAIN; 3157 SPAGAIN;
2866 } 3158 }
2867 } 3159 }
2868} 3160}
2869 3161
… …
2873 ALIAS: 3165 ALIAS:
2874 is_ready = CF_READY 3166 is_ready = CF_READY
2875 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
2876 is_new = CF_NEW 3168 is_new = CF_NEW
2877 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
2878 CODE: 3171 CODE:
2879 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
2880 OUTPUT: 3173 OUTPUT:
2881 RETVAL 3174 RETVAL
2882 3175
… …
2886 CODE: 3179 CODE:
2887{ 3180{
2888 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
2889 SV **throwp = self == current ? &CORO_THROW : &self->except; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
2890 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
2891 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
2892} 3186}
2893 3187
2894void 3188void
2895api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
… …
2898 3192
2899SV * 3193SV *
2900has_cctx (Coro::State coro) 3194has_cctx (Coro::State coro)
2901 PROTOTYPE: $ 3195 PROTOTYPE: $
2902 CODE: 3196 CODE:
2903 RETVAL = boolSV (!!coro->cctx); 3197 /* maybe manage the running flag differently */
3198 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2904 OUTPUT: 3199 OUTPUT:
2905 RETVAL 3200 RETVAL
2906 3201
2907int 3202int
2908is_traced (Coro::State coro) 3203is_traced (Coro::State coro)
… …
2928 3223
2929void 3224void
2930force_cctx () 3225force_cctx ()
2931 PROTOTYPE: 3226 PROTOTYPE:
2932 CODE: 3227 CODE:
2933 SvSTATE_current->cctx->idle_sp = 0; 3228 cctx_current->idle_sp = 0;
2934 3229
2935void 3230void
2936swap_defsv (Coro::State self) 3231swap_defsv (Coro::State self)
2937 PROTOTYPE: $ 3232 PROTOTYPE: $
2938 ALIAS: 3233 ALIAS:
… …
2946 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3241 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2947 3242
2948 SV *tmp = *src; *src = *dst; *dst = tmp; 3243 SV *tmp = *src; *src = *dst; *dst = tmp;
2949 } 3244 }
2950 3245
3246void
3247cancel (Coro::State self)
3248 CODE:
3249 coro_state_destroy (aTHX_ self);
3250 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3251
3252
3253SV *
3254enable_times (int enabled = enable_times)
3255 CODE:
3256{
3257 RETVAL = boolSV (enable_times);
3258
3259 if (enabled != enable_times)
3260 {
3261 enable_times = enabled;
3262
3263 coro_times_update ();
3264 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3265 }
3266}
3267 OUTPUT:
3268 RETVAL
3269
3270void
3271times (Coro::State self)
3272 PPCODE:
3273{
3274 struct coro *current = SvSTATE (coro_current);
3275
3276 if (expect_false (current == self))
3277 {
3278 coro_times_update ();
3279 coro_times_add (SvSTATE (coro_current));
3280 }
3281
3282 EXTEND (SP, 2);
3283 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3284 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3285
3286 if (expect_false (current == self))
3287 coro_times_sub (SvSTATE (coro_current));
3288}
2951 3289
2952MODULE = Coro::State PACKAGE = Coro 3290MODULE = Coro::State PACKAGE = Coro
2953 3291
2954BOOT: 3292BOOT:
2955{ 3293{
2956 int i;
2957
2958 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2959 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2960 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2961 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
2962 cv_coro_terminate = get_cv ( "Coro::terminate", GV_ADD); 3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2963 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); 3298 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2964 SvREADONLY_on (coro_current); 3299 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3300 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3301 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3302 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2965 3303
2966 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3304 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
2967 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3305 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
2968 cv_pool_handler = get_cv ("Coro::_pool_handler", 0); SvREADONLY_on (cv_pool_handler); 3306 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
2969 cv_coro_new = get_cv ("Coro::new", 0); SvREADONLY_on (cv_coro_new); 3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
2970 3308
2971 coro_stash = gv_stashpv ("Coro", TRUE); 3309 coro_stash = gv_stashpv ("Coro", TRUE);
2972 3310
2973 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2974 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2975 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2976 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3314 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2977 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3315 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2978 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3316 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2979
2980 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2981 coro_ready[i] = newAV ();
2982 3317
2983 { 3318 {
2984 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3319 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2985 3320
2986 coroapi.schedule = api_schedule; 3321 coroapi.schedule = api_schedule;
3322 coroapi.schedule_to = api_schedule_to;
2987 coroapi.cede = api_cede; 3323 coroapi.cede = api_cede;
2988 coroapi.cede_notself = api_cede_notself; 3324 coroapi.cede_notself = api_cede_notself;
2989 coroapi.ready = api_ready; 3325 coroapi.ready = api_ready;
2990 coroapi.is_ready = api_is_ready; 3326 coroapi.is_ready = api_is_ready;
2991 coroapi.nready = coro_nready; 3327 coroapi.nready = coro_nready;
… …
2996 SvREADONLY_on (sv); 3332 SvREADONLY_on (sv);
2997 } 3333 }
2998} 3334}
2999 3335
3000void 3336void
3337terminate (...)
3338 CODE:
3339 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3340
3341void
3001schedule (...) 3342schedule (...)
3002 CODE: 3343 CODE:
3003 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3344 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3345
3346void
3347schedule_to (...)
3348 CODE:
3349 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3350
3351void
3352cede_to (...)
3353 CODE:
3354 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
3004 3355
3005void 3356void
3006cede (...) 3357cede (...)
3007 CODE: 3358 CODE:
3008 CORO_EXECUTE_SLF_XS (slf_init_cede); 3359 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
3022void 3373void
3023_set_readyhook (SV *hook) 3374_set_readyhook (SV *hook)
3024 PROTOTYPE: $ 3375 PROTOTYPE: $
3025 CODE: 3376 CODE:
3026 SvREFCNT_dec (coro_readyhook); 3377 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook);
3027 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3028 3380
3029int 3381int
3030prio (Coro::State coro, int newprio = 0) 3382prio (Coro::State coro, int newprio = 0)
3031 PROTOTYPE: $;$ 3383 PROTOTYPE: $;$
… …
3038 if (items > 1) 3390 if (items > 1)
3039 { 3391 {
3040 if (ix) 3392 if (ix)
3041 newprio = coro->prio - newprio; 3393 newprio = coro->prio - newprio;
3042 3394
3043 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3395 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3044 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3396 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3045 3397
3046 coro->prio = newprio; 3398 coro->prio = newprio;
3047 } 3399 }
3048} 3400}
3049 OUTPUT: 3401 OUTPUT:
… …
3064 RETVAL = coro_nready; 3416 RETVAL = coro_nready;
3065 OUTPUT: 3417 OUTPUT:
3066 RETVAL 3418 RETVAL
3067 3419
3068void 3420void
3421suspend (Coro::State self)
3422 PROTOTYPE: $
3423 CODE:
3424 self->flags |= CF_SUSPENDED;
3425
3426void
3427resume (Coro::State self)
3428 PROTOTYPE: $
3429 CODE:
3430 self->flags &= ~CF_SUSPENDED;
3431
3432void
3069_pool_handler (...) 3433_pool_handler (...)
3070 CODE: 3434 CODE:
3071 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3435 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3072 3436
3073void 3437void
… …
3089 PUSHMARK (SP); 3453 PUSHMARK (SP);
3090 EXTEND (SP, 2); 3454 EXTEND (SP, 2);
3091 PUSHs (sv_Coro); 3455 PUSHs (sv_Coro);
3092 PUSHs ((SV *)cv_pool_handler); 3456 PUSHs ((SV *)cv_pool_handler);
3093 PUTBACK; 3457 PUTBACK;
3094 call_sv ((SV *)cv_coro_new, G_SCALAR); 3458 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3095 SPAGAIN; 3459 SPAGAIN;
3096 3460
3097 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3461 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs));
3098 } 3462 }
3099 3463
… …
3126rouse_wait (...) 3490rouse_wait (...)
3127 PROTOTYPE: ;$ 3491 PROTOTYPE: ;$
3128 PPCODE: 3492 PPCODE:
3129 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3493 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3130 3494
3495void
3496on_enter (SV *block)
3497 ALIAS:
3498 on_leave = 1
3499 PROTOTYPE: &
3500 CODE:
3501{
3502 struct coro *coro = SvSTATE_current;
3503 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3504
3505 block = s_get_cv_croak (block);
3506
3507 if (!*avp)
3508 *avp = newAV ();
3509
3510 av_push (*avp, SvREFCNT_inc (block));
3511
3512 if (!ix)
3513 on_enterleave_call (aTHX_ block);
3514
3515 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3516 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3517 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3518}
3519
3131 3520
3132MODULE = Coro::State PACKAGE = PerlIO::cede 3521MODULE = Coro::State PACKAGE = PerlIO::cede
3133 3522
3134BOOT: 3523BOOT:
3135 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3524 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3138MODULE = Coro::State PACKAGE = Coro::Semaphore 3527MODULE = Coro::State PACKAGE = Coro::Semaphore
3139 3528
3140SV * 3529SV *
3141new (SV *klass, SV *count = 0) 3530new (SV *klass, SV *count = 0)
3142 CODE: 3531 CODE:
3532{
3533 int semcnt = 1;
3534
3535 if (count)
3536 {
3537 SvGETMAGIC (count);
3538
3539 if (SvOK (count))
3540 semcnt = SvIV (count);
3541 }
3542
3143 RETVAL = sv_bless ( 3543 RETVAL = sv_bless (
3144 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3544 coro_waitarray_new (aTHX_ semcnt),
3145 GvSTASH (CvGV (cv)) 3545 GvSTASH (CvGV (cv))
3146 ); 3546 );
3547}
3147 OUTPUT: 3548 OUTPUT:
3148 RETVAL 3549 RETVAL
3149 3550
3150# helper for Coro::Channel 3551# helper for Coro::Channel and others
3151SV * 3552SV *
3152_alloc (int count) 3553_alloc (int count)
3153 CODE: 3554 CODE:
3154 RETVAL = coro_waitarray_new (aTHX_ count); 3555 RETVAL = coro_waitarray_new (aTHX_ count);
3155 OUTPUT: 3556 OUTPUT:
… …
3213 for (i = 1; i <= wcount; ++i) 3614 for (i = 1; i <= wcount; ++i)
3214 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3615 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3215 } 3616 }
3216} 3617}
3217 3618
3619MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3620
3621void
3622_may_delete (SV *sem, int count, int extra_refs)
3623 PPCODE:
3624{
3625 AV *av = (AV *)SvRV (sem);
3626
3627 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3628 && AvFILLp (av) == 0 /* no waiters, just count */
3629 && SvIV (AvARRAY (av)[0]) == count)
3630 XSRETURN_YES;
3631
3632 XSRETURN_NO;
3633}
3634
3218MODULE = Coro::State PACKAGE = Coro::Signal 3635MODULE = Coro::State PACKAGE = Coro::Signal
3219 3636
3220SV * 3637SV *
3221new (SV *klass) 3638new (SV *klass)
3222 CODE: 3639 CODE:
… …
3293 3710
3294void 3711void
3295_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
3296 CODE: 3713 CODE:
3297{ 3714{
3298 CV *req_cv = coro_sv_2cv (aTHX_ req); 3715 SV *req_cv = s_get_cv_croak (req);
3299 /* newXSproto doesn't return the CV on 5.8 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
3300 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3301 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
3302 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3719 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3303} 3720}

Diff Legend

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