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.324 by root, Sat Nov 22 07:02:28 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#ifndef Newx
107# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
108#endif
109
110/* 5.8.7 */
111#ifndef SvRV_set
112# define SvRV_set(s,v) SvRV(s) = (v)
113#endif
114
115#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 56#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
116# undef CORO_STACKGUARD 57# undef CORO_STACKGUARD
117#endif 58#endif
118 59
119#ifndef CORO_STACKGUARD 60#ifndef CORO_STACKGUARD
133#else 74#else
134# define dSTACKLEVEL volatile void *stacklevel 75# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 76# define STACKLEVEL ((void *)&stacklevel)
136#endif 77#endif
137 78
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 79#define IN_DESTRUCT PL_dirty
139 80
140#if __GNUC__ >= 3 81#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 82# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 83# define expect(expr,value) __builtin_expect ((expr), (value))
143# define INLINE static inline 84# define INLINE static inline
144#else 85#else
145# define attribute(x) 86# define attribute(x)
146# define expect(expr,value) (expr) 87# define expect(expr,value) (expr)
147# define INLINE static 88# define INLINE static
159# if CORO_PTHREAD 100# if CORO_PTHREAD
160static void *coro_thx; 101static void *coro_thx;
161# endif 102# endif
162#endif 103#endif
163 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
164static 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]);
165 117
166/* we hijack an hopefully unused CV flag for our purposes */ 118/* we hijack an hopefully unused CV flag for our purposes */
167#define CVf_SLF 0x4000 119#define CVf_SLF 0x4000
168static OP *pp_slf (pTHX); 120static OP *pp_slf (pTHX);
169 121
175static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
176static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 128static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
177 129
178static AV *av_destroy; /* destruction queue */ 130static AV *av_destroy; /* destruction queue */
179static SV *sv_manager; /* the manager coro */ 131static SV *sv_manager; /* the manager coro */
132static SV *sv_idle; /* $Coro::idle */
180 133
181static GV *irsgv; /* $/ */ 134static GV *irsgv; /* $/ */
182static GV *stdoutgv; /* *STDOUT */ 135static GV *stdoutgv; /* *STDOUT */
183static SV *rv_diehook; 136static SV *rv_diehook;
184static SV *rv_warnhook; 137static SV *rv_warnhook;
194static CV *cv_coro_state_new; 147static CV *cv_coro_state_new;
195 148
196/* Coro::AnyEvent */ 149/* Coro::AnyEvent */
197static SV *sv_activity; 150static SV *sv_activity;
198 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;
157
199static struct coro_cctx *cctx_first; 158static struct coro_cctx *cctx_first;
200static int cctx_count, cctx_idle; 159static int cctx_count, cctx_idle;
201 160
202enum { 161enum {
203 CC_MAPPED = 0x01, 162 CC_MAPPED = 0x01,
237enum { 196enum {
238 CF_RUNNING = 0x0001, /* coroutine is running */ 197 CF_RUNNING = 0x0001, /* coroutine is running */
239 CF_READY = 0x0002, /* coroutine is ready */ 198 CF_READY = 0x0002, /* coroutine is ready */
240 CF_NEW = 0x0004, /* has never been switched to */ 199 CF_NEW = 0x0004, /* has never been switched to */
241 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 */
242}; 202};
243 203
244/* 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 */
245typedef struct 205typedef struct
246{ 206{
247 SV *defsv; 207 SV *defsv;
248 AV *defav; 208 AV *defav;
249 SV *errsv; 209 SV *errsv;
250 SV *irsgv; 210 SV *irsgv;
211 HV *hinthv;
251#define VAR(name,type) type name; 212#define VAR(name,type) type name;
252# include "state.h" 213# include "state.h"
253#undef VAR 214#undef VAR
254} perl_slots; 215} perl_slots;
255 216
257 218
258/* this is a structure representing a perl-level coroutine */ 219/* this is a structure representing a perl-level coroutine */
259struct coro { 220struct coro {
260 /* the C coroutine allocated to this perl coroutine, if any */ 221 /* the C coroutine allocated to this perl coroutine, if any */
261 coro_cctx *cctx; 222 coro_cctx *cctx;
223
224 /* ready queue */
225 struct coro *next_ready;
262 226
263 /* state data */ 227 /* state data */
264 struct CoroSLF slf_frame; /* saved slf frame */ 228 struct CoroSLF slf_frame; /* saved slf frame */
265 AV *mainstack; 229 AV *mainstack;
266 perl_slots *slot; /* basically the saved sp */ 230 perl_slots *slot; /* basically the saved sp */
283 /* async_pool */ 247 /* async_pool */
284 SV *saved_deffh; 248 SV *saved_deffh;
285 SV *invoke_cb; 249 SV *invoke_cb;
286 AV *invoke_av; 250 AV *invoke_av;
287 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
288 /* linked list */ 259 /* linked list */
289 struct coro *next, *prev; 260 struct coro *next, *prev;
290}; 261};
291 262
292typedef struct coro *Coro__State; 263typedef struct coro *Coro__State;
297/* the mainr easonw e don't support windows process emulation */ 268/* the mainr easonw e don't support windows process emulation */
298static struct CoroSLF slf_frame; /* the current slf frame */ 269static struct CoroSLF slf_frame; /* the current slf frame */
299 270
300/** Coro ********************************************************************/ 271/** Coro ********************************************************************/
301 272
302#define PRIO_MAX 3 273#define CORO_PRIO_MAX 3
303#define PRIO_HIGH 1 274#define CORO_PRIO_HIGH 1
304#define PRIO_NORMAL 0 275#define CORO_PRIO_NORMAL 0
305#define PRIO_LOW -1 276#define CORO_PRIO_LOW -1
306#define PRIO_IDLE -3 277#define CORO_PRIO_IDLE -3
307#define PRIO_MIN -4 278#define CORO_PRIO_MIN -4
308 279
309/* for Coro.pm */ 280/* for Coro.pm */
310static SV *coro_current; 281static SV *coro_current;
311static SV *coro_readyhook; 282static SV *coro_readyhook;
312static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 283static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
313static CV *cv_coro_run, *cv_coro_terminate; 284static CV *cv_coro_run, *cv_coro_terminate;
314static struct coro *coro_first; 285static struct coro *coro_first;
315#define coro_nready coroapi.nready 286#define coro_nready coroapi.nready
316 287
317/** lowlevel stuff **********************************************************/ 288/** lowlevel stuff **********************************************************/
344 get_hv (name, create); 315 get_hv (name, create);
345#endif 316#endif
346 return get_hv (name, create); 317 return get_hv (name, create);
347} 318}
348 319
349/* may croak */ 320INLINE void
350INLINE CV * 321coro_times_update ()
351coro_sv_2cv (pTHX_ SV *sv)
352{ 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{
353 HV *st; 389 HV *stash;
354 GV *gvp; 390 MAGIC *mg;
355 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;
356} 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 */
357 418
358static AV * 419static AV *
359coro_derive_padlist (pTHX_ CV *cv) 420coro_derive_padlist (pTHX_ CV *cv)
360{ 421{
361 AV *padlist = CvPADLIST (cv); 422 AV *padlist = CvPADLIST (cv);
369 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 430 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
370#endif 431#endif
371 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 432 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
372 --AvFILLp (padlist); 433 --AvFILLp (padlist);
373 434
374 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 435 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
375 av_store (newpadlist, 1, (SV *)newpad); 436 av_store (newpadlist, 1, (SV *)newpad);
376 437
377 return newpadlist; 438 return newpadlist;
378} 439}
379 440
380static void 441static void
381free_padlist (pTHX_ AV *padlist) 442free_padlist (pTHX_ AV *padlist)
382{ 443{
383 /* may be during global destruction */ 444 /* may be during global destruction */
384 if (SvREFCNT (padlist)) 445 if (!IN_DESTRUCT)
385 { 446 {
386 I32 i = AvFILLp (padlist); 447 I32 i = AvFILLp (padlist);
387 while (i >= 0) 448
449 while (i > 0) /* special-case index 0 */
388 { 450 {
389 SV **svp = av_fetch (padlist, i--, FALSE); 451 /* we try to be extra-careful here */
390 if (svp) 452 AV *av = (AV *)AvARRAY (padlist)[i--];
391 { 453 I32 j = AvFILLp (av);
392 SV *sv; 454
393 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 455 while (j >= 0)
456 SvREFCNT_dec (AvARRAY (av)[j--]);
457
458 AvFILLp (av) = -1;
394 SvREFCNT_dec (sv); 459 SvREFCNT_dec (av);
395
396 SvREFCNT_dec (*svp);
397 }
398 } 460 }
399 461
462 SvREFCNT_dec (AvARRAY (padlist)[0]);
463
464 AvFILLp (padlist) = -1;
400 SvREFCNT_dec ((SV*)padlist); 465 SvREFCNT_dec ((SV*)padlist);
401 } 466 }
402} 467}
403 468
404static int 469static int
405coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 470coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
406{ 471{
407 AV *padlist; 472 AV *padlist;
408 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;
409 478
410 /* casting is fun. */ 479 /* casting is fun. */
411 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 480 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
412 free_padlist (aTHX_ padlist); 481 free_padlist (aTHX_ padlist);
413 482
414 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 483 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
415 484
416 return 0; 485 return 0;
417} 486}
418
419#define CORO_MAGIC_type_cv 26
420#define CORO_MAGIC_type_state PERL_MAGIC_ext
421 487
422static MGVTBL coro_cv_vtbl = { 488static MGVTBL coro_cv_vtbl = {
423 0, 0, 0, 0, 489 0, 0, 0, 0,
424 coro_cv_free 490 coro_cv_free
425}; 491};
426
427#define CORO_MAGIC_NN(sv, type) \
428 (expect_true (SvMAGIC (sv)->mg_type == type) \
429 ? SvMAGIC (sv) \
430 : mg_find (sv, type))
431
432#define CORO_MAGIC(sv, type) \
433 (expect_true (SvMAGIC (sv)) \
434 ? CORO_MAGIC_NN (sv, type) \
435 : 0)
436
437#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
438#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
439
440INLINE struct coro *
441SvSTATE_ (pTHX_ SV *coro)
442{
443 HV *stash;
444 MAGIC *mg;
445
446 if (SvROK (coro))
447 coro = SvRV (coro);
448
449 if (expect_false (SvTYPE (coro) != SVt_PVHV))
450 croak ("Coro::State object required");
451
452 stash = SvSTASH (coro);
453 if (expect_false (stash != coro_stash && stash != coro_state_stash))
454 {
455 /* very slow, but rare, check */
456 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
457 croak ("Coro::State object required");
458 }
459
460 mg = CORO_MAGIC_state (coro);
461 return (struct coro *)mg->mg_ptr;
462}
463
464#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
465
466/* faster than SvSTATE, but expects a coroutine hv */
467#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
468#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
469 492
470/* the next two functions merely cache the padlists */ 493/* the next two functions merely cache the padlists */
471static void 494static void
472get_padlist (pTHX_ CV *cv) 495get_padlist (pTHX_ CV *cv)
473{ 496{
501 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);
502 525
503 av = (AV *)mg->mg_obj; 526 av = (AV *)mg->mg_obj;
504 527
505 if (expect_false (AvFILLp (av) >= AvMAX (av))) 528 if (expect_false (AvFILLp (av) >= AvMAX (av)))
506 av_extend (av, AvMAX (av) + 1); 529 av_extend (av, AvFILLp (av) + 1);
507 530
508 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 531 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
509} 532}
510 533
511/** load & save, init *******************************************************/ 534/** load & save, init *******************************************************/
535
536static void
537on_enterleave_call (pTHX_ SV *cb);
512 538
513static void 539static void
514load_perl (pTHX_ Coro__State c) 540load_perl (pTHX_ Coro__State c)
515{ 541{
516 perl_slots *slot = c->slot; 542 perl_slots *slot = c->slot;
517 c->slot = 0; 543 c->slot = 0;
518 544
519 PL_mainstack = c->mainstack; 545 PL_mainstack = c->mainstack;
520 546
521 GvSV (PL_defgv) = slot->defsv; 547 GvSV (PL_defgv) = slot->defsv;
522 GvAV (PL_defgv) = slot->defav; 548 GvAV (PL_defgv) = slot->defav;
523 GvSV (PL_errgv) = slot->errsv; 549 GvSV (PL_errgv) = slot->errsv;
524 GvSV (irsgv) = slot->irsgv; 550 GvSV (irsgv) = slot->irsgv;
551 GvHV (PL_hintgv) = slot->hinthv;
525 552
526 #define VAR(name,type) PL_ ## name = slot->name; 553 #define VAR(name,type) PL_ ## name = slot->name;
527 # include "state.h" 554 # include "state.h"
528 #undef VAR 555 #undef VAR
529 556
543 PUTBACK; 570 PUTBACK;
544 } 571 }
545 572
546 slf_frame = c->slf_frame; 573 slf_frame = c->slf_frame;
547 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 }
548} 591}
549 592
550static void 593static void
551save_perl (pTHX_ Coro__State c) 594save_perl (pTHX_ Coro__State c)
552{ 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
553 c->except = CORO_THROW; 612 c->except = CORO_THROW;
554 c->slf_frame = slf_frame; 613 c->slf_frame = slf_frame;
555 614
556 { 615 {
557 dSP; 616 dSP;
570 { 629 {
571 while (expect_true (cxix >= 0)) 630 while (expect_true (cxix >= 0))
572 { 631 {
573 PERL_CONTEXT *cx = &ccstk[cxix--]; 632 PERL_CONTEXT *cx = &ccstk[cxix--];
574 633
575 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))
576 { 635 {
577 CV *cv = cx->blk_sub.cv; 636 CV *cv = cx->blk_sub.cv;
578 637
579 if (expect_true (CvDEPTH (cv))) 638 if (expect_true (CvDEPTH (cv)))
580 { 639 {
604 /* we manually unroll here, as usually 2 slots is enough */ 663 /* we manually unroll here, as usually 2 slots is enough */
605 if (SLOT_COUNT >= 1) CXINC; 664 if (SLOT_COUNT >= 1) CXINC;
606 if (SLOT_COUNT >= 2) CXINC; 665 if (SLOT_COUNT >= 2) CXINC;
607 if (SLOT_COUNT >= 3) CXINC; 666 if (SLOT_COUNT >= 3) CXINC;
608 { 667 {
609 int i; 668 unsigned int i;
610 for (i = 3; i < SLOT_COUNT; ++i) 669 for (i = 3; i < SLOT_COUNT; ++i)
611 CXINC; 670 CXINC;
612 } 671 }
613 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 672 cxstack_ix -= SLOT_COUNT; /* undo allocation */
614 673
615 c->mainstack = PL_mainstack; 674 c->mainstack = PL_mainstack;
616 675
617 { 676 {
618 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 677 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
619 678
620 slot->defav = GvAV (PL_defgv); 679 slot->defav = GvAV (PL_defgv);
621 slot->defsv = DEFSV; 680 slot->defsv = DEFSV;
622 slot->errsv = ERRSV; 681 slot->errsv = ERRSV;
623 slot->irsgv = GvSV (irsgv); 682 slot->irsgv = GvSV (irsgv);
683 slot->hinthv = GvHV (PL_hintgv);
624 684
625 #define VAR(name,type) slot->name = PL_ ## name; 685 #define VAR(name,type) slot->name = PL_ ## name;
626 # include "state.h" 686 # include "state.h"
627 #undef VAR 687 #undef VAR
628 } 688 }
755#endif 815#endif
756 816
757/* 817/*
758 * This overrides the default magic get method of %SIG elements. 818 * This overrides the default magic get method of %SIG elements.
759 * 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
760 * 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
761 * readback here. 821 * readback here.
762 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
763 * not expecting this to actually change the hook. This is a potential problem
764 * when a schedule happens then, but we ignore this.
765 */ 822 */
766static int 823static int
767coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 824coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
768{ 825{
769 const char *s = MgPV_nolen_const (mg); 826 const char *s = MgPV_nolen_const (mg);
822 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 879 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
823 880
824 if (svp) 881 if (svp)
825 { 882 {
826 SV *old = *svp; 883 SV *old = *svp;
827 *svp = newSVsv (sv); 884 *svp = SvOK (sv) ? newSVsv (sv) : 0;
828 SvREFCNT_dec (old); 885 SvREFCNT_dec (old);
829 return 0; 886 return 0;
830 } 887 }
831 } 888 }
832 889
864 921
865 PL_runops = RUNOPS_DEFAULT; 922 PL_runops = RUNOPS_DEFAULT;
866 PL_curcop = &PL_compiling; 923 PL_curcop = &PL_compiling;
867 PL_in_eval = EVAL_NULL; 924 PL_in_eval = EVAL_NULL;
868 PL_comppad = 0; 925 PL_comppad = 0;
926 PL_comppad_name = 0;
927 PL_comppad_name_fill = 0;
928 PL_comppad_name_floor = 0;
869 PL_curpm = 0; 929 PL_curpm = 0;
870 PL_curpad = 0; 930 PL_curpad = 0;
871 PL_localizing = 0; 931 PL_localizing = 0;
872 PL_dirty = 0; 932 PL_dirty = 0;
873 PL_restartop = 0; 933 PL_restartop = 0;
874#if PERL_VERSION_ATLEAST (5,10,0) 934#if PERL_VERSION_ATLEAST (5,10,0)
875 PL_parser = 0; 935 PL_parser = 0;
876#endif 936#endif
937 PL_hints = 0;
877 938
878 /* recreate the die/warn hooks */ 939 /* recreate the die/warn hooks */
879 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 );
880 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);
881 942
882 GvSV (PL_defgv) = newSV (0); 943 GvSV (PL_defgv) = newSV (0);
883 GvAV (PL_defgv) = coro->args; coro->args = 0; 944 GvAV (PL_defgv) = coro->args; coro->args = 0;
884 GvSV (PL_errgv) = newSV (0); 945 GvSV (PL_errgv) = newSV (0);
885 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;
886 PL_rs = newSVsv (GvSV (irsgv)); 948 PL_rs = newSVsv (GvSV (irsgv));
887 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 949 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
888 950
889 { 951 {
890 dSP; 952 dSP;
916 978
917 PL_op = (OP *)&coro_setup_op; 979 PL_op = (OP *)&coro_setup_op;
918 980
919 /* copy throw, in case it was set before coro_setup */ 981 /* copy throw, in case it was set before coro_setup */
920 CORO_THROW = coro->except; 982 CORO_THROW = coro->except;
921}
922 983
984 if (expect_false (enable_times))
985 {
986 coro_times_update ();
987 coro_times_sub (coro);
988 }
989}
990
923static void 991static void
924coro_destruct (pTHX_ struct coro *coro) 992coro_unwind_stacks (pTHX)
925{ 993{
926 if (!IN_DESTRUCT) 994 if (!IN_DESTRUCT)
927 { 995 {
928 /* restore all saved variables and stuff */ 996 /* restore all saved variables and stuff */
929 LEAVE_SCOPE (0); 997 LEAVE_SCOPE (0);
937 POPSTACK_TO (PL_mainstack); 1005 POPSTACK_TO (PL_mainstack);
938 1006
939 /* unwind main stack */ 1007 /* unwind main stack */
940 dounwind (-1); 1008 dounwind (-1);
941 } 1009 }
1010}
942 1011
943 SvREFCNT_dec (GvSV (PL_defgv)); 1012static void
944 SvREFCNT_dec (GvAV (PL_defgv)); 1013coro_destruct_perl (pTHX_ struct coro *coro)
945 SvREFCNT_dec (GvSV (PL_errgv)); 1014{
946 SvREFCNT_dec (PL_defoutgv); 1015 SV *svf [9];
947 SvREFCNT_dec (PL_rs);
948 SvREFCNT_dec (GvSV (irsgv));
949 1016
950 SvREFCNT_dec (PL_diehook);
951 SvREFCNT_dec (PL_warnhook);
952 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
953 SvREFCNT_dec (coro->saved_deffh); 1049 SvREFCNT_dec (coro->saved_deffh);
954 SvREFCNT_dec (coro->rouse_cb); 1050 SvREFCNT_dec (coro->rouse_cb);
955 SvREFCNT_dec (coro->invoke_cb); 1051 SvREFCNT_dec (coro->invoke_cb);
956 SvREFCNT_dec (coro->invoke_av); 1052 SvREFCNT_dec (coro->invoke_av);
957 1053 }
958 coro_destruct_stacks (aTHX);
959} 1054}
960 1055
961INLINE void 1056INLINE void
962free_coro_mortal (pTHX) 1057free_coro_mortal (pTHX)
963{ 1058{
1168 /* 1263 /*
1169 * 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
1170 * 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)
1171 * 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
1172 * bootstrap-time "top" top_env, as we cannot restore the "main" 1267 * bootstrap-time "top" top_env, as we cannot restore the "main"
1173 * 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.
1174 */ 1271 */
1175 PL_top_env = main_top_env; 1272 PL_top_env = main_top_env;
1176 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 */
1177 } 1274 }
1178} 1275}
1255cctx_destroy (coro_cctx *cctx) 1352cctx_destroy (coro_cctx *cctx)
1256{ 1353{
1257 if (!cctx) 1354 if (!cctx)
1258 return; 1355 return;
1259 1356
1260 assert (cctx != cctx_current);//D temporary 1357 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1261 1358
1262 --cctx_count; 1359 --cctx_count;
1263 coro_destroy (&cctx->cctx); 1360 coro_destroy (&cctx->cctx);
1264 1361
1265 /* coro_transfer creates new, empty cctx's */ 1362 /* coro_transfer creates new, empty cctx's */
1329 /* TODO: throwing up here is considered harmful */ 1426 /* TODO: throwing up here is considered harmful */
1330 1427
1331 if (expect_true (prev != next)) 1428 if (expect_true (prev != next))
1332 { 1429 {
1333 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1430 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1334 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,");
1335 1432
1336 if (expect_false (next->flags & CF_RUNNING))
1337 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1338
1339 if (expect_false (next->flags & CF_DESTROYED)) 1433 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1340 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,");
1341 1435
1342#if !PERL_VERSION_ATLEAST (5,10,0) 1436#if !PERL_VERSION_ATLEAST (5,10,0)
1343 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1437 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1344 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,");
1345#endif 1439#endif
1383 coro_setup (aTHX_ next); 1477 coro_setup (aTHX_ next);
1384 } 1478 }
1385 else 1479 else
1386 load_perl (aTHX_ next); 1480 load_perl (aTHX_ next);
1387 1481
1388 assert (!prev->cctx);//D temporary
1389
1390 /* possibly untie and reuse the cctx */ 1482 /* possibly untie and reuse the cctx */
1391 if (expect_true ( 1483 if (expect_true (
1392 cctx_current->idle_sp == STACKLEVEL 1484 cctx_current->idle_sp == STACKLEVEL
1393 && !(cctx_current->flags & CC_TRACE) 1485 && !(cctx_current->flags & CC_TRACE)
1394 && !force_cctx 1486 && !force_cctx
1435coro_state_destroy (pTHX_ struct coro *coro) 1527coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1528{
1437 if (coro->flags & CF_DESTROYED) 1529 if (coro->flags & CF_DESTROYED)
1438 return 0; 1530 return 0;
1439 1531
1440 if (coro->on_destroy) 1532 if (coro->on_destroy && !PL_dirty)
1441 coro->on_destroy (aTHX_ coro); 1533 coro->on_destroy (aTHX_ coro);
1442 1534
1443 coro->flags |= CF_DESTROYED; 1535 coro->flags |= CF_DESTROYED;
1444 1536
1445 if (coro->flags & CF_READY) 1537 if (coro->flags & CF_READY)
1449 --coro_nready; 1541 --coro_nready;
1450 } 1542 }
1451 else 1543 else
1452 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 */
1453 1545
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1546 if (coro->mainstack
1455 { 1547 && coro->mainstack != main_mainstack
1456 struct coro temp; 1548 && coro->slot
1457 1549 && !PL_dirty)
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1459
1460 save_perl (aTHX_ &temp);
1461 load_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro); 1550 coro_destruct_perl (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1551
1470 cctx_destroy (coro->cctx); 1552 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1553 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1554 SvREFCNT_dec (coro->args);
1473 SvREFCNT_dec (CORO_THROW); 1555 SvREFCNT_dec (CORO_THROW);
1532 1614
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1615 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1616 TRANSFER (ta, 1);
1535} 1617}
1536 1618
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1619/** Coro ********************************************************************/
1561 1620
1562INLINE void 1621INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1622coro_enq (pTHX_ struct coro *coro)
1564{ 1623{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1624 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1625
1568INLINE 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 *
1569coro_deq (pTHX) 1634coro_deq (pTHX)
1570{ 1635{
1571 int prio; 1636 int prio;
1572 1637
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1638 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1639 {
1575 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 }
1576 1649
1577 return 0; 1650 return 0;
1578} 1651}
1579 1652
1580static int 1653static int
1582{ 1655{
1583 struct coro *coro; 1656 struct coro *coro;
1584 SV *sv_hook; 1657 SV *sv_hook;
1585 void (*xs_hook)(void); 1658 void (*xs_hook)(void);
1586 1659
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1660 coro = SvSTATE (coro_sv);
1591 1661
1592 if (coro->flags & CF_READY) 1662 if (coro->flags & CF_READY)
1593 return 0; 1663 return 0;
1594 1664
1647static void 1717static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1718prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1719{
1650 for (;;) 1720 for (;;)
1651 { 1721 {
1652 SV *next_sv = coro_deq (aTHX); 1722 struct coro *next = coro_deq (aTHX);
1653 1723
1654 if (expect_true (next_sv)) 1724 if (expect_true (next))
1655 { 1725 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1726 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1727 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1728 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1729 else
1662 { 1730 {
1663 next->flags &= ~CF_READY; 1731 next->flags &= ~CF_READY;
1664 --coro_nready; 1732 --coro_nready;
1665 1733
1668 } 1736 }
1669 } 1737 }
1670 else 1738 else
1671 { 1739 {
1672 /* nothing to schedule: call the idle handler */ 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 {
1673 dSP; 1750 dSP;
1674 1751
1675 ENTER; 1752 ENTER;
1676 SAVETMPS; 1753 SAVETMPS;
1677 1754
1678 PUSHMARK (SP); 1755 PUSHMARK (SP);
1679 PUTBACK; 1756 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1757 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1758
1682 FREETMPS; 1759 FREETMPS;
1683 LEAVE; 1760 LEAVE;
1761 }
1684 } 1762 }
1685 } 1763 }
1686} 1764}
1687 1765
1688INLINE void 1766INLINE void
1833 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1911 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1834 api_ready (aTHX_ sv_manager); 1912 api_ready (aTHX_ sv_manager);
1835 1913
1836 frame->prepare = prepare_schedule; 1914 frame->prepare = prepare_schedule;
1837 frame->check = slf_check_repeat; 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);*/
1838} 1920}
1839 1921
1840/*****************************************************************************/ 1922/*****************************************************************************/
1841/* async pool handler */ 1923/* async pool handler */
1842 1924
1920 2002
1921static void 2003static void
1922coro_rouse_callback (pTHX_ CV *cv) 2004coro_rouse_callback (pTHX_ CV *cv)
1923{ 2005{
1924 dXSARGS; 2006 dXSARGS;
1925 SV *data = (SV *)GENSUB_ARG; 2007 SV *data = (SV *)S_GENSUB_ARG;
1926 2008
1927 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2009 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1928 { 2010 {
1929 /* first call, set args */ 2011 /* first call, set args */
2012 SV *coro = SvRV (data);
1930 AV *av = newAV (); 2013 AV *av = newAV ();
1931 SV *coro = SvRV (data);
1932 2014
1933 SvRV_set (data, (SV *)av); 2015 SvRV_set (data, (SV *)av);
1934 api_ready (aTHX_ coro);
1935 SvREFCNT_dec (coro);
1936 2016
1937 /* better take a full copy of the arguments */ 2017 /* better take a full copy of the arguments */
1938 while (items--) 2018 while (items--)
1939 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);
1940 } 2023 }
1941 2024
1942 XSRETURN_EMPTY; 2025 XSRETURN_EMPTY;
1943} 2026}
1944 2027
1961 2044
1962 EXTEND (SP, AvFILLp (av) + 1); 2045 EXTEND (SP, AvFILLp (av) + 1);
1963 for (i = 0; i <= AvFILLp (av); ++i) 2046 for (i = 0; i <= AvFILLp (av); ++i)
1964 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2047 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1965 2048
1966 /* 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 */
1967 AvFILLp (av) = -1; 2050 AvFILLp (av) = -1;
1968 av_undef (av); 2051 av_undef (av);
1969 2052
1970 PUTBACK; 2053 PUTBACK;
1971 } 2054 }
1995 || SvTYPE (SvRV (cb)) != SVt_PVCV 2078 || SvTYPE (SvRV (cb)) != SVt_PVCV
1996 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2079 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1997 croak ("Coro::rouse_wait called with illegal callback argument,"); 2080 croak ("Coro::rouse_wait called with illegal callback argument,");
1998 2081
1999 { 2082 {
2000 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2083 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2001 SV *data = (SV *)GENSUB_ARG; 2084 SV *data = (SV *)S_GENSUB_ARG;
2002 2085
2003 frame->data = (void *)data; 2086 frame->data = (void *)data;
2004 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2087 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2005 frame->check = slf_check_rouse_wait; 2088 frame->check = slf_check_rouse_wait;
2006 } 2089 }
2010coro_new_rouse_cb (pTHX) 2093coro_new_rouse_cb (pTHX)
2011{ 2094{
2012 HV *hv = (HV *)SvRV (coro_current); 2095 HV *hv = (HV *)SvRV (coro_current);
2013 struct coro *coro = SvSTATE_hv (hv); 2096 struct coro *coro = SvSTATE_hv (hv);
2014 SV *data = newRV_inc ((SV *)hv); 2097 SV *data = newRV_inc ((SV *)hv);
2015 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2098 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2016 2099
2017 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);
2018 SvREFCNT_dec (data); /* magicext increases the refcount */ 2101 SvREFCNT_dec (data); /* magicext increases the refcount */
2019 2102
2020 SvREFCNT_dec (coro->rouse_cb); 2103 SvREFCNT_dec (coro->rouse_cb);
2261 2344
2262 PL_op->op_ppaddr = pp_slf; 2345 PL_op->op_ppaddr = pp_slf;
2263 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2346 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2264 2347
2265 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));
2266} 2396}
2267 2397
2268/*****************************************************************************/ 2398/*****************************************************************************/
2269/* PerlIO::cede */ 2399/* PerlIO::cede */
2270 2400
2344/* Coro::Semaphore & Coro::Signal */ 2474/* Coro::Semaphore & Coro::Signal */
2345 2475
2346static SV * 2476static SV *
2347coro_waitarray_new (pTHX_ int count) 2477coro_waitarray_new (pTHX_ int count)
2348{ 2478{
2349 /* 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 */
2350 AV *av = newAV (); 2480 AV *av = newAV ();
2351 SV **ary; 2481 SV **ary;
2352 2482
2353 /* unfortunately, building manually saves memory */ 2483 /* unfortunately, building manually saves memory */
2354 Newx (ary, 2, SV *); 2484 Newx (ary, 2, SV *);
2355 AvALLOC (av) = ary; 2485 AvALLOC (av) = ary;
2486#if PERL_VERSION_ATLEAST (5,10,0)
2356 /*AvARRAY (av) = ary;*/ 2487 AvARRAY (av) = ary;
2488#else
2357 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
2358 AvMAX (av) = 1; 2493 AvMAX (av) = 1;
2359 AvFILLp (av) = 0; 2494 AvFILLp (av) = 0;
2360 ary [0] = newSViv (count); 2495 ary [0] = newSViv (count);
2361 2496
2362 return newRV_noinc ((SV *)av); 2497 return newRV_noinc ((SV *)av);
2491{ 2626{
2492 if (items >= 2) 2627 if (items >= 2)
2493 { 2628 {
2494 /* callback form */ 2629 /* callback form */
2495 AV *av = (AV *)SvRV (arg [0]); 2630 AV *av = (AV *)SvRV (arg [0]);
2496 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2631 SV *cb_cv = s_get_cv_croak (arg [1]);
2497 2632
2498 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2633 av_push (av, SvREFCNT_inc_NN (cb_cv));
2499 2634
2500 if (SvIVX (AvARRAY (av)[0]) > 0) 2635 if (SvIVX (AvARRAY (av)[0]) > 0)
2501 coro_semaphore_adjust (aTHX_ av, 0); 2636 coro_semaphore_adjust (aTHX_ av, 0);
2502 2637
2503 frame->prepare = prepare_nop; 2638 frame->prepare = prepare_nop;
2527 AvARRAY (av)[0] = AvARRAY (av)[1]; 2662 AvARRAY (av)[0] = AvARRAY (av)[1];
2528 AvARRAY (av)[1] = cb; 2663 AvARRAY (av)[1] = cb;
2529 2664
2530 cb = av_shift (av); 2665 cb = av_shift (av);
2531 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 {
2532 api_ready (aTHX_ cb); 2677 api_ready (aTHX_ cb);
2533 sv_setiv (cb, 0); /* signal waiter */ 2678 sv_setiv (cb, 0); /* signal waiter */
2679 }
2680
2534 SvREFCNT_dec (cb); 2681 SvREFCNT_dec (cb);
2535 2682
2536 --count; 2683 --count;
2537 } 2684 }
2538} 2685}
2547static void 2694static void
2548slf_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)
2549{ 2696{
2550 AV *av = (AV *)SvRV (arg [0]); 2697 AV *av = (AV *)SvRV (arg [0]);
2551 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
2552 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]))
2553 { 2711 {
2554 SvIVX (AvARRAY (av)[0]) = 0; 2712 SvIVX (AvARRAY (av)[0]) = 0;
2555 frame->prepare = prepare_nop; 2713 frame->prepare = prepare_nop;
2556 frame->check = slf_check_nop; 2714 frame->check = slf_check_nop;
2557 } 2715 }
2558 else 2716 else
2559 { 2717 {
2560 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2718 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2561 2719
2562 av_push (av, waiter); 2720 av_push (av, waiter);
2563 2721
2564 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 */
2565 frame->prepare = prepare_schedule; 2723 frame->prepare = prepare_schedule;
2583 2741
2584static void 2742static void
2585coro_aio_callback (pTHX_ CV *cv) 2743coro_aio_callback (pTHX_ CV *cv)
2586{ 2744{
2587 dXSARGS; 2745 dXSARGS;
2588 AV *state = (AV *)GENSUB_ARG; 2746 AV *state = (AV *)S_GENSUB_ARG;
2589 SV *coro = av_pop (state); 2747 SV *coro = av_pop (state);
2590 SV *data_sv = newSV (sizeof (struct io_state)); 2748 SV *data_sv = newSV (sizeof (struct io_state));
2591 2749
2592 av_extend (state, items - 1); 2750 av_extend (state, items - 1);
2593 2751
2707 2865
2708 for (i = 0; i < items; ++i) 2866 for (i = 0; i < items; ++i)
2709 PUSHs (arg [i]); 2867 PUSHs (arg [i]);
2710 2868
2711 /* now push the callback closure */ 2869 /* now push the callback closure */
2712 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))));
2713 2871
2714 /* now call the AIO function - we assume our request is uncancelable */ 2872 /* now call the AIO function - we assume our request is uncancelable */
2715 PUTBACK; 2873 PUTBACK;
2716 call_sv ((SV *)req, G_VOID | G_DISCARD); 2874 call_sv ((SV *)req, G_VOID | G_DISCARD);
2717 } 2875 }
2804 2962
2805 if (!svp) croak ("Time::HiRes is required"); 2963 if (!svp) croak ("Time::HiRes is required");
2806 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 2964 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2807 2965
2808 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));
2809 } 2970 }
2810 2971
2811 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2972 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2812} 2973}
2813 2974
2814SV * 2975SV *
2815new (char *klass, ...) 2976new (char *klass, ...)
2816 ALIAS: 2977 ALIAS:
2818 CODE: 2979 CODE:
2819{ 2980{
2820 struct coro *coro; 2981 struct coro *coro;
2821 MAGIC *mg; 2982 MAGIC *mg;
2822 HV *hv; 2983 HV *hv;
2823 CV *cb; 2984 SV *cb;
2824 int i; 2985 int i;
2825 2986
2826 if (items > 1) 2987 if (items > 1)
2827 { 2988 {
2828 cb = coro_sv_2cv (aTHX_ ST (1)); 2989 cb = s_get_cv_croak (ST (1));
2829 2990
2830 if (!ix) 2991 if (!ix)
2831 { 2992 {
2832 if (CvISXSUB (cb)) 2993 if (CvISXSUB (cb))
2833 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");
2855 av_extend (coro->args, items - 1 + ix - 1); 3016 av_extend (coro->args, items - 1 + ix - 1);
2856 3017
2857 if (ix) 3018 if (ix)
2858 { 3019 {
2859 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb)); 3020 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2860 cb = cv_coro_run; 3021 cb = (SV *)cv_coro_run;
2861 } 3022 }
2862 3023
2863 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb); 3024 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2864 3025
2865 for (i = 2; i < items; i++) 3026 for (i = 2; i < items; i++)
2891SV * 3052SV *
2892clone (Coro::State coro) 3053clone (Coro::State coro)
2893 CODE: 3054 CODE:
2894{ 3055{
2895#if CORO_CLONE 3056#if CORO_CLONE
2896 struct coro *ncoro = coro_clone (coro); 3057 struct coro *ncoro = coro_clone (aTHX_ coro);
2897 MAGIC *mg; 3058 MAGIC *mg;
2898 /* TODO: too much duplication */ 3059 /* TODO: too much duplication */
2899 ncoro->hv = newHV (); 3060 ncoro->hv = newHV ();
2900 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3061 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2901 mg->mg_flags |= MGf_DUP; 3062 mg->mg_flags |= MGf_DUP;
2963 eval = 1 3124 eval = 1
2964 CODE: 3125 CODE:
2965{ 3126{
2966 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3127 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2967 { 3128 {
2968 struct coro temp; 3129 struct coro *current = SvSTATE_current;
2969 3130
2970 if (!(coro->flags & CF_RUNNING)) 3131 if (current != coro)
2971 { 3132 {
2972 PUTBACK; 3133 PUTBACK;
2973 save_perl (aTHX_ &temp); 3134 save_perl (aTHX_ current);
2974 load_perl (aTHX_ coro); 3135 load_perl (aTHX_ coro);
3136 SPAGAIN;
2975 } 3137 }
2976 3138
2977 {
2978 dSP;
2979 ENTER;
2980 SAVETMPS;
2981 PUTBACK;
2982 PUSHSTACK; 3139 PUSHSTACK;
3140
2983 PUSHMARK (SP); 3141 PUSHMARK (SP);
3142 PUTBACK;
2984 3143
2985 if (ix) 3144 if (ix)
2986 eval_sv (coderef, 0); 3145 eval_sv (coderef, 0);
2987 else 3146 else
2988 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3147 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2989 3148
2990 POPSTACK; 3149 POPSTACK;
2991 SPAGAIN; 3150 SPAGAIN;
2992 FREETMPS;
2993 LEAVE;
2994 PUTBACK;
2995 }
2996 3151
2997 if (!(coro->flags & CF_RUNNING)) 3152 if (current != coro)
2998 { 3153 {
3154 PUTBACK;
2999 save_perl (aTHX_ coro); 3155 save_perl (aTHX_ coro);
3000 load_perl (aTHX_ &temp); 3156 load_perl (aTHX_ current);
3001 SPAGAIN; 3157 SPAGAIN;
3002 } 3158 }
3003 } 3159 }
3004} 3160}
3005 3161
3009 ALIAS: 3165 ALIAS:
3010 is_ready = CF_READY 3166 is_ready = CF_READY
3011 is_running = CF_RUNNING 3167 is_running = CF_RUNNING
3012 is_new = CF_NEW 3168 is_new = CF_NEW
3013 is_destroyed = CF_DESTROYED 3169 is_destroyed = CF_DESTROYED
3170 is_suspended = CF_SUSPENDED
3014 CODE: 3171 CODE:
3015 RETVAL = boolSV (coro->flags & ix); 3172 RETVAL = boolSV (coro->flags & ix);
3016 OUTPUT: 3173 OUTPUT:
3017 RETVAL 3174 RETVAL
3018 3175
3022 CODE: 3179 CODE:
3023{ 3180{
3024 struct coro *current = SvSTATE_current; 3181 struct coro *current = SvSTATE_current;
3025 SV **throwp = self == current ? &CORO_THROW : &self->except; 3182 SV **throwp = self == current ? &CORO_THROW : &self->except;
3026 SvREFCNT_dec (*throwp); 3183 SvREFCNT_dec (*throwp);
3184 SvGETMAGIC (throw);
3027 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3185 *throwp = SvOK (throw) ? newSVsv (throw) : 0;
3028} 3186}
3029 3187
3030void 3188void
3031api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3189api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3083 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3241 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3084 3242
3085 SV *tmp = *src; *src = *dst; *dst = tmp; 3243 SV *tmp = *src; *src = *dst; *dst = tmp;
3086 } 3244 }
3087 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}
3088 3289
3089MODULE = Coro::State PACKAGE = Coro 3290MODULE = Coro::State PACKAGE = Coro
3090 3291
3091BOOT: 3292BOOT:
3092{ 3293{
3093 int i;
3094
3095 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3294 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3096 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3295 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3097 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3296 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3098 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3297 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3099 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3298 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3100 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3299 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3101 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3300 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3102 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3301 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3302 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3103 3303
3104 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);
3105 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3305 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3106 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3306 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3107 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3307 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new);
3108 3308
3109 coro_stash = gv_stashpv ("Coro", TRUE); 3309 coro_stash = gv_stashpv ("Coro", TRUE);
3110 3310
3111 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3311 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3112 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3312 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3113 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3313 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3114 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3314 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3115 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3315 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3116 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3316 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3117
3118 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3119 coro_ready[i] = newAV ();
3120 3317
3121 { 3318 {
3122 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3319 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3123 3320
3124 coroapi.schedule = api_schedule; 3321 coroapi.schedule = api_schedule;
3165cede_notself (...) 3362cede_notself (...)
3166 CODE: 3363 CODE:
3167 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3364 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3168 3365
3169void 3366void
3170_cancel (Coro::State self)
3171 CODE:
3172 coro_state_destroy (aTHX_ self);
3173 coro_call_on_destroy (aTHX_ self);
3174
3175void
3176_set_current (SV *current) 3367_set_current (SV *current)
3177 PROTOTYPE: $ 3368 PROTOTYPE: $
3178 CODE: 3369 CODE:
3179 SvREFCNT_dec (SvRV (coro_current)); 3370 SvREFCNT_dec (SvRV (coro_current));
3180 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3371 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3182void 3373void
3183_set_readyhook (SV *hook) 3374_set_readyhook (SV *hook)
3184 PROTOTYPE: $ 3375 PROTOTYPE: $
3185 CODE: 3376 CODE:
3186 SvREFCNT_dec (coro_readyhook); 3377 SvREFCNT_dec (coro_readyhook);
3378 SvGETMAGIC (hook);
3187 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3379 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
3188 3380
3189int 3381int
3190prio (Coro::State coro, int newprio = 0) 3382prio (Coro::State coro, int newprio = 0)
3191 PROTOTYPE: $;$ 3383 PROTOTYPE: $;$
3198 if (items > 1) 3390 if (items > 1)
3199 { 3391 {
3200 if (ix) 3392 if (ix)
3201 newprio = coro->prio - newprio; 3393 newprio = coro->prio - newprio;
3202 3394
3203 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3395 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3204 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3396 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3205 3397
3206 coro->prio = newprio; 3398 coro->prio = newprio;
3207 } 3399 }
3208} 3400}
3209 OUTPUT: 3401 OUTPUT:
3222 PROTOTYPE: 3414 PROTOTYPE:
3223 CODE: 3415 CODE:
3224 RETVAL = coro_nready; 3416 RETVAL = coro_nready;
3225 OUTPUT: 3417 OUTPUT:
3226 RETVAL 3418 RETVAL
3419
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;
3227 3431
3228void 3432void
3229_pool_handler (...) 3433_pool_handler (...)
3230 CODE: 3434 CODE:
3231 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3435 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3286rouse_wait (...) 3490rouse_wait (...)
3287 PROTOTYPE: ;$ 3491 PROTOTYPE: ;$
3288 PPCODE: 3492 PPCODE:
3289 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3493 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3290 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
3291 3520
3292MODULE = Coro::State PACKAGE = PerlIO::cede 3521MODULE = Coro::State PACKAGE = PerlIO::cede
3293 3522
3294BOOT: 3523BOOT:
3295 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3524 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3298MODULE = Coro::State PACKAGE = Coro::Semaphore 3527MODULE = Coro::State PACKAGE = Coro::Semaphore
3299 3528
3300SV * 3529SV *
3301new (SV *klass, SV *count = 0) 3530new (SV *klass, SV *count = 0)
3302 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
3303 RETVAL = sv_bless ( 3543 RETVAL = sv_bless (
3304 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3544 coro_waitarray_new (aTHX_ semcnt),
3305 GvSTASH (CvGV (cv)) 3545 GvSTASH (CvGV (cv))
3306 ); 3546 );
3547}
3307 OUTPUT: 3548 OUTPUT:
3308 RETVAL 3549 RETVAL
3309 3550
3310# helper for Coro::Channel 3551# helper for Coro::Channel and others
3311SV * 3552SV *
3312_alloc (int count) 3553_alloc (int count)
3313 CODE: 3554 CODE:
3314 RETVAL = coro_waitarray_new (aTHX_ count); 3555 RETVAL = coro_waitarray_new (aTHX_ count);
3315 OUTPUT: 3556 OUTPUT:
3373 for (i = 1; i <= wcount; ++i) 3614 for (i = 1; i <= wcount; ++i)
3374 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3615 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3375 } 3616 }
3376} 3617}
3377 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
3378MODULE = Coro::State PACKAGE = Coro::Signal 3635MODULE = Coro::State PACKAGE = Coro::Signal
3379 3636
3380SV * 3637SV *
3381new (SV *klass) 3638new (SV *klass)
3382 CODE: 3639 CODE:
3453 3710
3454void 3711void
3455_register (char *target, char *proto, SV *req) 3712_register (char *target, char *proto, SV *req)
3456 CODE: 3713 CODE:
3457{ 3714{
3458 CV *req_cv = coro_sv_2cv (aTHX_ req); 3715 SV *req_cv = s_get_cv_croak (req);
3459 /* newXSproto doesn't return the CV on 5.8 */ 3716 /* newXSproto doesn't return the CV on 5.8 */
3460 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3717 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3461 sv_setpv ((SV *)slf_cv, proto); 3718 sv_setpv ((SV *)slf_cv, proto);
3462 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);
3463} 3720}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines