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.206 by root, Tue Oct 9 15:45:26 2007 UTC vs.
Revision 1.278 by root, Sun Nov 16 07:09:28 2008 UTC

… …
4#define PERL_EXT 4#define PERL_EXT
5 5
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 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
14#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
23# include <inttypes.h> /* most portable stdint.h */
24#endif
15 25
16#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
17# include <unistd.h> 27# include <unistd.h>
18# include <sys/mman.h> 28# include <sys/mman.h>
19# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
36# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
37#endif 47#endif
38 48
39#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
40# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
41# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
42#else
43# define REGISTER_STACK(cctx,start,end)
44#endif 51#endif
45 52
46/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
47#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
48 55
49#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
50 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
51 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
52 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
71# ifndef IS_PADCONST 78# ifndef IS_PADCONST
72# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
73# endif 80# endif
74#endif 81#endif
75 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
76/* 5.8.7 */ 101/* 5.8.7 */
77#ifndef SvRV_set 102#ifndef SvRV_set
78# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
79#endif 104#endif
80 105
81/* 5.8.8 */
82#ifndef GV_NOTQUAL
83# define GV_NOTQUAL 0
84#endif
85#ifndef newSV
86# define newSV(l) NEWSV(0,l)
87#endif
88
89#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
90# undef CORO_STACKGUARD 107# undef CORO_STACKGUARD
91#endif 108#endif
92 109
93#ifndef CORO_STACKGUARD 110#ifndef CORO_STACKGUARD
… …
99# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
100#endif 117#endif
101 118
102/* The next macros try to return the current stack pointer, in an as 119/* The next macros try to return the current stack pointer, in an as
103 * portable way as possible. */ 120 * portable way as possible. */
104#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
105#define STACKLEVEL ((void *)&stacklevel) 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
106 126
107#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
108 128
109#if __GNUC__ >= 3 129#if __GNUC__ >= 3
110# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
111# define BARRIER __asm__ __volatile__ ("" : : : "memory")
112# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
113#else 133#else
114# define attribute(x) 134# define attribute(x)
115# define BARRIER
116# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
117#endif 137#endif
118 138
119#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
120#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
121 141
122#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
123 143
124#include "CoroAPI.h" 144#include "CoroAPI.h"
125 145
126#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
127static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
128# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
129# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
130#else 155#else
156
131# define LOCK (void)0 157# define LOCK (void)0
132# define UNLOCK (void)0 158# define UNLOCK (void)0
133#endif
134 159
135#define strpair(const) const, sizeof (const) - 1 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
136 166
137/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
138struct io_state 168struct io_state
139{ 169{
170 AV *res;
140 int errorno; 171 int errorno;
141 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
142 int laststatval; 173 int laststatval;
143 Stat_t statcache; 174 Stat_t statcache;
144}; 175};
145 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
146static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
147static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
148static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
149static JMPENV *main_top_env; 183static JMPENV *main_top_env;
150static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
151static SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
152 187
153static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
154static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
155 190static SV *rv_diehook;
191static SV *rv_warnhook;
156static HV *hv_sig; /* %SIG */ 192static HV *hv_sig; /* %SIG */
157static SV *sv_diehook;
158static SV *sv_warnhook;
159 193
160/* async_pool helper stuff */ 194/* async_pool helper stuff */
161static SV *sv_pool_rss; 195static SV *sv_pool_rss;
162static SV *sv_pool_size; 196static SV *sv_pool_size;
163static AV *av_async_pool; 197static AV *av_async_pool;
198
199/* Coro::AnyEvent */
200static SV *sv_activity;
164 201
165static struct coro_cctx *cctx_first; 202static struct coro_cctx *cctx_first;
166static int cctx_count, cctx_idle; 203static int cctx_count, cctx_idle;
167 204
168enum { 205enum {
… …
173 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
174 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
175}; 212};
176 213
177/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
178typedef struct coro_cctx { 215typedef struct coro_cctx
216{
179 struct coro_cctx *next; 217 struct coro_cctx *next;
180 218
181 /* the stack */ 219 /* the stack */
182 void *sptr; 220 void *sptr;
183 size_t ssize; 221 size_t ssize;
… …
186 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
187 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
188 JMPENV *top_env; 226 JMPENV *top_env;
189 coro_context cctx; 227 coro_context cctx;
190 228
229 U32 gen;
191#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
192 int valgrind_id; 231 int valgrind_id;
193#endif 232#endif
194 unsigned char flags; 233 unsigned char flags;
195} coro_cctx; 234} coro_cctx;
… …
200 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
201 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
202}; 241};
203 242
204/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
205typedef struct { 244typedef struct
245{
206 SV *defsv; 246 SV *defsv;
207 AV *defav; 247 AV *defav;
208 SV *errsv; 248 SV *errsv;
209 SV *irsgv; 249 SV *irsgv;
210#define VAR(name,type) type name; 250#define VAR(name,type) type name;
… …
214 254
215#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
216 256
217/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
218struct coro { 258struct coro {
219 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
220 coro_cctx *cctx; 260 coro_cctx *cctx;
221 261
222 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
223 AV *mainstack; 264 AV *mainstack;
224 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
225 266
226 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
227 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
… …
242 struct coro *next, *prev; 283 struct coro *next, *prev;
243}; 284};
244 285
245typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
246typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
247 290
248/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
249 292
250#define PRIO_MAX 3 293#define PRIO_MAX 3
251#define PRIO_HIGH 1 294#define PRIO_HIGH 1
… …
254#define PRIO_IDLE -3 297#define PRIO_IDLE -3
255#define PRIO_MIN -4 298#define PRIO_MIN -4
256 299
257/* for Coro.pm */ 300/* for Coro.pm */
258static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
259static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
260static int coro_nready;
261static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
262 306
263/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
264 308
265static SV * 309static SV *
266coro_get_sv (const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
267{ 311{
268#if PERL_VERSION_ATLEAST (5,9,0) 312#if PERL_VERSION_ATLEAST (5,10,0)
269 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
270 get_sv (name, create); 314 get_sv (name, create);
271#endif 315#endif
272 return get_sv (name, create); 316 return get_sv (name, create);
273} 317}
274 318
275static AV * 319static AV *
276coro_get_av (const char *name, int create) 320coro_get_av (pTHX_ const char *name, int create)
277{ 321{
278#if PERL_VERSION_ATLEAST (5,9,0) 322#if PERL_VERSION_ATLEAST (5,10,0)
279 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
280 get_av (name, create); 324 get_av (name, create);
281#endif 325#endif
282 return get_av (name, create); 326 return get_av (name, create);
283} 327}
284 328
285static HV * 329static HV *
286coro_get_hv (const char *name, int create) 330coro_get_hv (pTHX_ const char *name, int create)
287{ 331{
288#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
289 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
290 get_hv (name, create); 334 get_hv (name, create);
291#endif 335#endif
292 return get_hv (name, create); 336 return get_hv (name, create);
293} 337}
… …
298 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
299 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
300 344
301 newpadlist = newAV (); 345 newpadlist = newAV ();
302 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
303#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
304 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
305#else 349#else
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
307#endif 351#endif
308 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
309 --AvFILLp (padlist); 353 --AvFILLp (padlist);
310 354
311 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
312 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
313 357
314 return newpadlist; 358 return newpadlist;
315} 359}
316 360
… …
346 390
347 /* casting is fun. */ 391 /* casting is fun. */
348 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
349 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
350 394
351 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
352 396
353 return 0; 397 return 0;
354} 398}
355 399
356#define PERL_MAGIC_coro PERL_MAGIC_ext 400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
357 402
358static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 403static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0,
405 coro_cv_free
406};
359 407
360#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
361 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
362 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
363 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
364 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
365 : 0 413 : 0
366 414
367static struct coro * 415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
417
418INLINE struct coro *
368SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
369{ 420{
370 HV *stash; 421 HV *stash;
371 MAGIC *mg; 422 MAGIC *mg;
372 423
… …
382 /* very slow, but rare, check */ 433 /* very slow, but rare, check */
383 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
384 croak ("Coro::State object required"); 435 croak ("Coro::State object required");
385 } 436 }
386 437
387 mg = CORO_MAGIC (coro); 438 mg = CORO_MAGIC_state (coro);
388 return (struct coro *)mg->mg_ptr; 439 return (struct coro *)mg->mg_ptr;
389} 440}
390 441
391#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
392 443
393/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
394static void 445static void
395get_padlist (pTHX_ CV *cv) 446get_padlist (pTHX_ CV *cv)
396{ 447{
397 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
398 AV *av; 449 AV *av;
399 450
400 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
401 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
402 else 453 else
403 { 454 {
404#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
405 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
406 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
407 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
408 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
409 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
410#else 462#else
… …
414} 466}
415 467
416static void 468static void
417put_padlist (pTHX_ CV *cv) 469put_padlist (pTHX_ CV *cv)
418{ 470{
419 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
420 AV *av; 472 AV *av;
421 473
422 if (expect_false (!mg)) 474 if (expect_false (!mg))
423 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
424 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
425 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
426 mg->mg_virtual = &vtbl_coro;
427 mg->mg_obj = (SV *)newAV ();
428 }
429 476
430 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
431 478
432 if (expect_false (AvFILLp (av) >= AvMAX (av))) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
433 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
… …
451 GvSV (irsgv) = slot->irsgv; 498 GvSV (irsgv) = slot->irsgv;
452 499
453 #define VAR(name,type) PL_ ## name = slot->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
454 # include "state.h" 501 # include "state.h"
455 #undef VAR 502 #undef VAR
456
457 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
458 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
459 503
460 { 504 {
461 dSP; 505 dSP;
462 506
463 CV *cv; 507 CV *cv;
… …
470 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
471 } 515 }
472 516
473 PUTBACK; 517 PUTBACK;
474 } 518 }
519
520 slf_frame = c->slf_frame;
475} 521}
476 522
477static void 523static void
478save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
479{ 525{
526 c->slf_frame = slf_frame;
527
480 { 528 {
481 dSP; 529 dSP;
482 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
483 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
484 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
… …
502 550
503 if (expect_true (CvDEPTH (cv))) 551 if (expect_true (CvDEPTH (cv)))
504 { 552 {
505 EXTEND (SP, 3); 553 EXTEND (SP, 3);
506 PUSHs ((SV *)CvPADLIST (cv)); 554 PUSHs ((SV *)CvPADLIST (cv));
507 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
508 PUSHs ((SV *)cv); 556 PUSHs ((SV *)cv);
509 557
510 CvDEPTH (cv) = 0; 558 CvDEPTH (cv) = 0;
511 get_padlist (aTHX_ cv); 559 get_padlist (aTHX_ cv);
512 } 560 }
… …
551 #undef VAR 599 #undef VAR
552 } 600 }
553} 601}
554 602
555/* 603/*
556 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
557 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
558 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
559 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
560 */ 608 */
561#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
… …
592 640
593 New(54,PL_savestack,24,ANY); 641 New(54,PL_savestack,24,ANY);
594 PL_savestack_ix = 0; 642 PL_savestack_ix = 0;
595 PL_savestack_max = 24; 643 PL_savestack_max = 24;
596 644
597#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
598 New(54,PL_retstack,4,OP*); 646 New(54,PL_retstack,4,OP*);
599 PL_retstack_ix = 0; 647 PL_retstack_ix = 0;
600 PL_retstack_max = 4; 648 PL_retstack_max = 4;
601#endif 649#endif
602} 650}
… …
604 652
605/* 653/*
606 * destroy the stacks, the callchain etc... 654 * destroy the stacks, the callchain etc...
607 */ 655 */
608static void 656static void
609coro_destroy_stacks (pTHX) 657coro_destruct_stacks (pTHX)
610{ 658{
611 while (PL_curstackinfo->si_next) 659 while (PL_curstackinfo->si_next)
612 PL_curstackinfo = PL_curstackinfo->si_next; 660 PL_curstackinfo = PL_curstackinfo->si_next;
613 661
614 while (PL_curstackinfo) 662 while (PL_curstackinfo)
… …
625 673
626 Safefree (PL_tmps_stack); 674 Safefree (PL_tmps_stack);
627 Safefree (PL_markstack); 675 Safefree (PL_markstack);
628 Safefree (PL_scopestack); 676 Safefree (PL_scopestack);
629 Safefree (PL_savestack); 677 Safefree (PL_savestack);
630#if !PERL_VERSION_ATLEAST (5,9,0) 678#if !PERL_VERSION_ATLEAST (5,10,0)
631 Safefree (PL_retstack); 679 Safefree (PL_retstack);
632#endif 680#endif
633} 681}
634 682
635static size_t 683static size_t
… …
651 #undef VAR 699 #undef VAR
652 } 700 }
653 else 701 else
654 slot = coro->slot; 702 slot = coro->slot;
655 703
704 if (slot)
705 {
656 rss += sizeof (slot->curstackinfo); 706 rss += sizeof (slot->curstackinfo);
657 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
658 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 708 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
659 rss += slot->tmps_max * sizeof (SV *); 709 rss += slot->tmps_max * sizeof (SV *);
660 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
661 rss += slot->scopestack_max * sizeof (I32); 711 rss += slot->scopestack_max * sizeof (I32);
662 rss += slot->savestack_max * sizeof (ANY); 712 rss += slot->savestack_max * sizeof (ANY);
663 713
664#if !PERL_VERSION_ATLEAST (5,9,0) 714#if !PERL_VERSION_ATLEAST (5,10,0)
665 rss += slot->retstack_max * sizeof (OP *); 715 rss += slot->retstack_max * sizeof (OP *);
666#endif 716#endif
717 }
667 } 718 }
668 719
669 return rss; 720 return rss;
670} 721}
671 722
672/** coroutine stack handling ************************************************/ 723/** coroutine stack handling ************************************************/
724
725static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
726static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
727static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
728
729/* apparently < 5.8.8 */
730#ifndef MgPV_nolen_const
731#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
732 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
733 (const char*)(mg)->mg_ptr)
734#endif
735
736/*
737 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide
740 * readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */
745static int
746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{
748 const char *s = MgPV_nolen_const (mg);
749
750 if (*s == '_')
751 {
752 SV **svp = 0;
753
754 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
755 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
756
757 if (svp)
758 {
759 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
760 return 0;
761 }
762 }
763
764 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
765}
766
767static int
768coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
769{
770 const char *s = MgPV_nolen_const (mg);
771
772 if (*s == '_')
773 {
774 SV **svp = 0;
775
776 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
777 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
778
779 if (svp)
780 {
781 SV *old = *svp;
782 *svp = 0;
783 SvREFCNT_dec (old);
784 return 0;
785 }
786 }
787
788 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
789}
790
791static int
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{
794 const char *s = MgPV_nolen_const (mg);
795
796 if (*s == '_')
797 {
798 SV **svp = 0;
799
800 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802
803 if (svp)
804 {
805 SV *old = *svp;
806 *svp = newSVsv (sv);
807 SvREFCNT_dec (old);
808 return 0;
809 }
810 }
811
812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
813}
814
815static void
816prepare_nop (pTHX_ struct coro_transfer_args *ta)
817{
818 /* kind of mega-hacky, but works */
819 ta->next = ta->prev = (struct coro *)ta;
820}
821
822static int
823slf_check_nop (pTHX_ struct CoroSLF *frame)
824{
825 return 0;
826}
673 827
674static void 828static void
675coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
676{ 830{
677 /* 831 /*
… …
686 PL_curpm = 0; 840 PL_curpm = 0;
687 PL_curpad = 0; 841 PL_curpad = 0;
688 PL_localizing = 0; 842 PL_localizing = 0;
689 PL_dirty = 0; 843 PL_dirty = 0;
690 PL_restartop = 0; 844 PL_restartop = 0;
691 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 845#if PERL_VERSION_ATLEAST (5,10,0)
692 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 846 PL_parser = 0;
847#endif
848
849 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
693 852
694 GvSV (PL_defgv) = newSV (0); 853 GvSV (PL_defgv) = newSV (0);
695 GvAV (PL_defgv) = coro->args; coro->args = 0; 854 GvAV (PL_defgv) = coro->args; coro->args = 0;
696 GvSV (PL_errgv) = newSV (0); 855 GvSV (PL_errgv) = newSV (0);
697 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
698 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
699 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
700 859
701 { 860 {
702 dSP; 861 dSP;
703 LOGOP myop; 862 UNOP myop;
704 863
705 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
706 myop.op_next = Nullop; 865 myop.op_next = Nullop;
707 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
708 867
709 PUSHMARK (SP); 868 PUSHMARK (SP);
710 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
712 PL_op = (OP *)&myop; 871 PL_op = (OP *)&myop;
713 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
714 SPAGAIN; 873 SPAGAIN;
715 } 874 }
716 875
717 ENTER; /* necessary e.g. for dounwind and to balance the xsub-entersub */ 876 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
718} 881}
719 882
720static void 883static void
721coro_destroy (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
722{ 885{
723 if (!IN_DESTRUCT) 886 if (!IN_DESTRUCT)
724 { 887 {
725 /* restore all saved variables and stuff */ 888 /* restore all saved variables and stuff */
726 LEAVE_SCOPE (0); 889 LEAVE_SCOPE (0);
… …
748 SvREFCNT_dec (PL_warnhook); 911 SvREFCNT_dec (PL_warnhook);
749 912
750 SvREFCNT_dec (coro->saved_deffh); 913 SvREFCNT_dec (coro->saved_deffh);
751 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
752 915
753 coro_destroy_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
754} 917}
755 918
756static void 919INLINE void
757free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
758{ 921{
759 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
760 { 923 {
761 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
… …
795 : cx->blk_gimme == G_SCALAR ? bot + 1 958 : cx->blk_gimme == G_SCALAR ? bot + 1
796 : bot; 959 : bot;
797 960
798 av_extend (av, top - bot); 961 av_extend (av, top - bot);
799 while (bot < top) 962 while (bot < top)
800 av_push (av, SvREFCNT_inc (*bot++)); 963 av_push (av, SvREFCNT_inc_NN (*bot++));
801 964
802 PL_runops = RUNOPS_DEFAULT; 965 PL_runops = RUNOPS_DEFAULT;
803 ENTER; 966 ENTER;
804 SAVETMPS; 967 SAVETMPS;
805 EXTEND (SP, 3); 968 EXTEND (SP, 3);
806 PUSHMARK (SP); 969 PUSHMARK (SP);
807 PUSHs (&PL_sv_no); 970 PUSHs (&PL_sv_no);
808 PUSHs (fullname); 971 PUSHs (fullname);
809 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 972 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
810 PUTBACK; 973 PUTBACK;
811 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 974 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
812 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 975 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
813 SPAGAIN; 976 SPAGAIN;
814 FREETMPS; 977 FREETMPS;
815 LEAVE; 978 LEAVE;
816 PL_runops = runops_trace; 979 PL_runops = runops_trace;
… …
843 SAVETMPS; 1006 SAVETMPS;
844 EXTEND (SP, 3); 1007 EXTEND (SP, 3);
845 PUSHMARK (SP); 1008 PUSHMARK (SP);
846 PUSHs (&PL_sv_yes); 1009 PUSHs (&PL_sv_yes);
847 PUSHs (fullname); 1010 PUSHs (fullname);
848 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1011 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
849 PUTBACK; 1012 PUTBACK;
850 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
851 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1014 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
852 SPAGAIN; 1015 SPAGAIN;
853 FREETMPS; 1016 FREETMPS;
854 LEAVE; 1017 LEAVE;
855 PL_runops = runops_trace; 1018 PL_runops = runops_trace;
… …
869 PL_runops = RUNOPS_DEFAULT; 1032 PL_runops = RUNOPS_DEFAULT;
870 PUSHMARK (SP); 1033 PUSHMARK (SP);
871 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1034 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
872 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1035 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
873 PUTBACK; 1036 PUTBACK;
874 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 1037 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
875 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1038 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
876 SPAGAIN; 1039 SPAGAIN;
877 FREETMPS; 1040 FREETMPS;
878 LEAVE; 1041 LEAVE;
879 PL_runops = runops_trace; 1042 PL_runops = runops_trace;
… …
885 1048
886 TAINT_NOT; 1049 TAINT_NOT;
887 return 0; 1050 return 0;
888} 1051}
889 1052
1053static void
1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1055{
1056 ta->prev = (struct coro *)cctx;
1057 ta->next = 0;
1058}
1059
890/* inject a fake call to Coro::State::_cctx_init into the execution */ 1060/* inject a fake call to Coro::State::_cctx_init into the execution */
891/* _cctx_init should be careful, as it could be called at almost any time */ 1061/* _cctx_init should be careful, as it could be called at almost any time */
892/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
893static void NOINLINE 1064static void NOINLINE
894cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
895{ 1066{
896 dSP; 1067 dSP;
897 LOGOP myop; 1068 UNOP myop;
898 1069
899 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
900 1071
901 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
902 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
903 1074
904 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
905 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
906 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
907 1078
908 PUSHMARK (SP); 1079 PUSHMARK (SP);
909 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
910 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
911 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
912 PUTBACK; 1083 PUTBACK;
913 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
914 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
915 SPAGAIN; 1086 SPAGAIN;
916} 1087}
917 1088
1089/* the tail of transfer: execute stuff we can only do after a transfer */
1090INLINE void
1091transfer_tail (pTHX)
1092{
1093 struct coro *next = (struct coro *)transfer_next;
1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1096
1097 free_coro_mortal (aTHX);
1098 UNLOCK;
1099
1100 if (expect_false (next->throw))
1101 {
1102 SV *exception = sv_2mortal (next->throw);
1103
1104 next->throw = 0;
1105 sv_setsv (ERRSV, exception);
1106 croak (0);
1107 }
1108}
1109
918/* 1110/*
919 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
920 */ 1112 */
921static void 1113static void
922cctx_run (void *arg) 1114cctx_run (void *arg)
923{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
924 dTHX; 1122 dTHX;
925 1123
926 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
927 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
928
929 /* we now skip the entersub that lead to transfer() */
930 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
931 1127
932 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
933 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
934 1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX);
1134
935 /* somebody or something will hit me for both perl_run and PL_restartop */ 1135 /* somebody or something will hit me for both perl_run and PL_restartop */
936 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
937 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
938 1138
939 /* 1139 /*
940 * If perl-run returns we assume exit() was being called or the coro 1140 * If perl-run returns we assume exit() was being called or the coro
941 * fell off the end, which seems to be the only valid (non-bug) 1141 * fell off the end, which seems to be the only valid (non-bug)
942 * reason for perl_run to return. We try to exit by jumping to the 1142 * reason for perl_run to return. We try to exit by jumping to the
943 * bootstrap-time "top" top_env, as we cannot restore the "main" 1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
944 * coroutine as Coro has no such concept 1144 * coroutine as Coro has no such concept
945 */ 1145 */
946 PL_top_env = main_top_env; 1146 PL_top_env = main_top_env;
947 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1147 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1148 }
948} 1149}
949 1150
950static coro_cctx * 1151static coro_cctx *
951cctx_new () 1152cctx_new ()
952{ 1153{
953 coro_cctx *cctx; 1154 coro_cctx *cctx;
1155
1156 ++cctx_count;
1157 New (0, cctx, 1, coro_cctx);
1158
1159 cctx->gen = cctx_gen;
1160 cctx->flags = 0;
1161 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1162
1163 return cctx;
1164}
1165
1166/* create a new cctx only suitable as source */
1167static coro_cctx *
1168cctx_new_empty ()
1169{
1170 coro_cctx *cctx = cctx_new ();
1171
1172 cctx->sptr = 0;
1173 coro_create (&cctx->cctx, 0, 0, 0, 0);
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx suitable as destination/running a perl interpreter */
1179static coro_cctx *
1180cctx_new_run ()
1181{
1182 coro_cctx *cctx = cctx_new ();
954 void *stack_start; 1183 void *stack_start;
955 size_t stack_size; 1184 size_t stack_size;
956 1185
957 ++cctx_count;
958
959 Newz (0, cctx, 1, coro_cctx);
960
961#if HAVE_MMAP 1186#if HAVE_MMAP
962 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1187 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
963 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
964 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1189 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
965 1190
966 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
967 { 1192 {
968# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
969 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
970# endif 1195 #endif
971 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
972 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
973 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
974 } 1199 }
975 else 1200 else
976#endif 1201#endif
977 { 1202 {
978 cctx->ssize = coro_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
979 New (0, cctx->sptr, coro_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
980 1205
981 if (!cctx->sptr) 1206 if (!cctx->sptr)
982 { 1207 {
983 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
984 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
985 } 1210 }
986 1211
987 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
988 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
989 } 1214 }
990 1215
991 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1216 #if CORO_USE_VALGRIND
1217 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1218 #endif
1219
992 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1220 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
993 1221
994 return cctx; 1222 return cctx;
995} 1223}
996 1224
… …
999{ 1227{
1000 if (!cctx) 1228 if (!cctx)
1001 return; 1229 return;
1002 1230
1003 --cctx_count; 1231 --cctx_count;
1232 coro_destroy (&cctx->cctx);
1004 1233
1234 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr)
1236 {
1005#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1006 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1007#endif 1239 #endif
1008 1240
1009#if HAVE_MMAP 1241#if HAVE_MMAP
1010 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1011 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1012 else 1244 else
1013#endif 1245#endif
1014 Safefree (cctx->sptr); 1246 Safefree (cctx->sptr);
1247 }
1015 1248
1016 Safefree (cctx); 1249 Safefree (cctx);
1017} 1250}
1018 1251
1019/* wether this cctx should be destructed */ 1252/* wether this cctx should be destructed */
1020#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1253#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1021 1254
1022static coro_cctx * 1255static coro_cctx *
1023cctx_get (pTHX) 1256cctx_get (pTHX)
1024{ 1257{
1025 while (expect_true (cctx_first)) 1258 while (expect_true (cctx_first))
… …
1032 return cctx; 1265 return cctx;
1033 1266
1034 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
1035 } 1268 }
1036 1269
1037 return cctx_new (); 1270 return cctx_new_run ();
1038} 1271}
1039 1272
1040static void 1273static void
1041cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1042{ 1275{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277
1043 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1044 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1045 { 1280 {
1046 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1047 cctx_first = first->next; 1282 cctx_first = first->next;
1048 --cctx_idle; 1283 --cctx_idle;
1049 1284
… …
1061transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1062{ 1297{
1063 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1064 { 1299 {
1065 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1066 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1067 1302
1068 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1069 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1070 1305
1071 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1072 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1073 1308
1074 if (
1075#if PERL_VERSION_ATLEAST (5,9,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1076 expect_false (PL_parser)
1077#else
1078 expect_false (PL_lex_state != LEX_NOTPARSING) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1079#endif
1080 )
1081 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1312#endif
1082 } 1313 }
1083} 1314}
1084 1315
1085/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1086static void NOINLINE 1317static void NOINLINE
1087transfer (pTHX_ struct coro *prev, struct coro *next) 1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1088{ 1319{
1089 dSTACKLEVEL; 1320 dSTACKLEVEL;
1090 1321
1091 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1092 if (expect_false (!next)) 1323 if (expect_false (!next))
1093 { 1324 {
1094 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = (void *)stacklevel;
1095 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1096 } 1327 }
1097 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1098 { 1329 {
1099 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1100 1331
1101 if (expect_false (prev->flags & CF_NEW)) 1332 if (expect_false (prev->flags & CF_NEW))
1102 { 1333 {
1103 /* create a new empty context */ 1334 /* create a new empty/source context */
1104 Newz (0, prev->cctx, 1, coro_cctx); 1335 prev->cctx = cctx_new_empty ();
1105 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1106 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1107 } 1338 }
1108 1339
1109 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1110 next->flags |= CF_RUNNING; 1341 next->flags |= CF_RUNNING;
1111 1342
1112 LOCK; 1343 LOCK;
1344
1345 /* first get rid of the old state */
1346 save_perl (aTHX_ prev);
1113 1347
1114 if (expect_false (next->flags & CF_NEW)) 1348 if (expect_false (next->flags & CF_NEW))
1115 { 1349 {
1116 /* need to start coroutine */ 1350 /* need to start coroutine */
1117 next->flags &= ~CF_NEW; 1351 next->flags &= ~CF_NEW;
1118 /* first get rid of the old state */
1119 save_perl (aTHX_ prev);
1120 /* setup coroutine call */ 1352 /* setup coroutine call */
1121 coro_setup (aTHX_ next); 1353 coro_setup (aTHX_ next);
1122 } 1354 }
1123 else 1355 else
1356 load_perl (aTHX_ next);
1357
1358 prev__cctx = prev->cctx;
1359
1360 /* possibly untie and reuse the cctx */
1361 if (expect_true (
1362 prev__cctx->idle_sp == (void *)stacklevel
1363 && !(prev__cctx->flags & CC_TRACE)
1364 && !force_cctx
1365 ))
1124 { 1366 {
1125 /* coroutine already started */
1126 save_perl (aTHX_ prev);
1127 load_perl (aTHX_ next);
1128 }
1129
1130 prev__cctx = prev->cctx;
1131
1132 /* possibly "free" the cctx */
1133 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1134 {
1135 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1367 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1136 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1368 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1137 1369
1138 prev->cctx = 0; 1370 prev->cctx = 0;
1139 1371
1140 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1141 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1148 1380
1149 ++next->usecount; 1381 ++next->usecount;
1150 1382
1151 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1152 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1385
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1153 1388
1154 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1155 { 1390 {
1156 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1157 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1158 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1159 } 1394 }
1160 1395
1161 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1162 UNLOCK;
1163
1164 if (expect_false (prev->throw || next->throw))
1165 {
1166 struct coro *coro = SvSTATE (coro_current);
1167
1168 if (coro->throw)
1169 {
1170 SV *exception = coro->throw;
1171 coro->throw = 0;
1172 sv_setsv (ERRSV, exception);
1173 croak (0);
1174 }
1175 }
1176 } 1397 }
1177} 1398}
1178 1399
1179struct transfer_args
1180{
1181 struct coro *prev, *next;
1182};
1183
1184#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1185#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1186 1402
1187/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1188 1404
1189static int 1405static int
… …
1207 1423
1208 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1209 { 1425 {
1210 struct coro temp; 1426 struct coro temp;
1211 1427
1212 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1213 croak ("FATAL: tried to destroy currently running coroutine");
1214 1429
1215 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1216 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1217 1432
1218 coro_destroy (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1219 1434
1220 load_perl (aTHX_ &temp); 1435 load_perl (aTHX_ &temp);
1221 1436
1222 coro->slot = 0; 1437 coro->slot = 0;
1223 } 1438 }
… …
1269# define MGf_DUP 0 1484# define MGf_DUP 0
1270#endif 1485#endif
1271}; 1486};
1272 1487
1273static void 1488static void
1274prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1489prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1275{ 1490{
1276 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1277 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1278 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1279} 1494}
1280 1495
1281static void 1496static void
1282api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1283{ 1498{
1284 dTHX;
1285 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1286 1500
1287 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1288 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1289} 1503}
1290 1504
1291/** Coro ********************************************************************/ 1505/** Coro ********************************************************************/
1292 1506
1293static void 1507static void
… …
1295{ 1509{
1296 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1510 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1297} 1511}
1298 1512
1299static SV * 1513static SV *
1300coro_deq (pTHX_ int min_prio) 1514coro_deq (pTHX)
1301{ 1515{
1302 int prio = PRIO_MAX - PRIO_MIN; 1516 int prio;
1303 1517
1304 min_prio -= PRIO_MIN;
1305 if (min_prio < 0)
1306 min_prio = 0;
1307
1308 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1309 if (AvFILLp (coro_ready [prio]) >= 0) 1519 if (AvFILLp (coro_ready [prio]) >= 0)
1310 return av_shift (coro_ready [prio]); 1520 return av_shift (coro_ready [prio]);
1311 1521
1312 return 0; 1522 return 0;
1313} 1523}
1314 1524
1315static int 1525static int
1316api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1317{ 1527{
1318 dTHX;
1319 struct coro *coro; 1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
1320 1531
1321 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1322 coro_sv = SvRV (coro_sv); 1533 coro_sv = SvRV (coro_sv);
1323 1534
1324 coro = SvSTATE (coro_sv); 1535 coro = SvSTATE (coro_sv);
… …
1327 return 0; 1538 return 0;
1328 1539
1329 coro->flags |= CF_READY; 1540 coro->flags |= CF_READY;
1330 1541
1331 LOCK; 1542 LOCK;
1543
1544 sv_hook = coro_nready ? 0 : coro_readyhook;
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1546
1332 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1333 ++coro_nready; 1548 ++coro_nready;
1549
1334 UNLOCK; 1550 UNLOCK;
1551
1552 if (sv_hook)
1553 {
1554 dSP;
1555
1556 ENTER;
1557 SAVETMPS;
1558
1559 PUSHMARK (SP);
1560 PUTBACK;
1561 call_sv (sv_hook, G_DISCARD);
1562 SPAGAIN;
1563
1564 FREETMPS;
1565 LEAVE;
1566 }
1567
1568 if (xs_hook)
1569 xs_hook ();
1335 1570
1336 return 1; 1571 return 1;
1337} 1572}
1338 1573
1339static int 1574static int
1340api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1341{ 1576{
1342 dTHX;
1343 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1344} 1578}
1345 1579
1346static void 1580INLINE void
1347prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1348{ 1582{
1349 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1350 1584
1351 for (;;) 1585 for (;;)
1352 { 1586 {
1353 LOCK; 1587 LOCK;
1354 next_sv = coro_deq (aTHX_ PRIO_MIN); 1588 next_sv = coro_deq (aTHX);
1355 1589
1356 /* nothing to schedule: call the idle handler */ 1590 /* nothing to schedule: call the idle handler */
1357 if (expect_false (!next_sv)) 1591 if (expect_false (!next_sv))
1358 { 1592 {
1359 dSP; 1593 dSP;
… …
1363 SAVETMPS; 1597 SAVETMPS;
1364 1598
1365 PUSHMARK (SP); 1599 PUSHMARK (SP);
1366 PUTBACK; 1600 PUTBACK;
1367 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1368 1603
1369 FREETMPS; 1604 FREETMPS;
1370 LEAVE; 1605 LEAVE;
1371 continue; 1606 continue;
1372 } 1607 }
… …
1376 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1377 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1378 { 1613 {
1379 UNLOCK; 1614 UNLOCK;
1380 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1381 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1382 continue; 1617 continue;
1383 } 1618 }
1384 1619
1385 --coro_nready; 1620 --coro_nready;
1386 UNLOCK; 1621 UNLOCK;
… …
1389 1624
1390 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1391 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1392 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1393 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1394 assert (ta->next->flags & CF_READY); 1629 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1395 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1396 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1397 1632
1398 LOCK; 1633 LOCK;
1399 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1400 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1401 UNLOCK; 1636 UNLOCK;
1402} 1637}
1403 1638
1404static void 1639INLINE void
1405prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1406{ 1641{
1407 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1408 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1409} 1644}
1410 1645
1646INLINE void
1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1648{
1649 SV *prev = SvRV (coro_current);
1650
1651 if (coro_nready)
1652 {
1653 prepare_schedule (aTHX_ ta);
1654 api_ready (aTHX_ prev);
1655 }
1656 else
1657 prepare_nop (aTHX_ ta);
1658}
1659
1660static void
1661api_schedule (pTHX)
1662{
1663 struct coro_transfer_args ta;
1664
1665 prepare_schedule (aTHX_ &ta);
1666 TRANSFER (ta, 1);
1667}
1668
1411static int 1669static int
1412prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1413{ 1671{
1414 if (coro_nready) 1672 struct coro_transfer_args ta;
1415 { 1673
1416 SV *prev = SvRV (coro_current);
1417 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1418 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1419 return 1; 1679 return 1;
1420 } 1680 }
1421 else 1681 else
1422 return 0; 1682 return 0;
1423} 1683}
1424 1684
1425static void
1426api_schedule (void)
1427{
1428 dTHX;
1429 struct transfer_args ta;
1430
1431 prepare_schedule (aTHX_ &ta);
1432 TRANSFER (ta);
1433}
1434
1435static int 1685static int
1436api_cede (void) 1686api_cede_notself (pTHX)
1437{ 1687{
1438 dTHX; 1688 if (coro_nready)
1689 {
1439 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1440 1691
1441 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1442
1443 if (expect_true (ta.prev != ta.next))
1444 {
1445 TRANSFER (ta); 1693 TRANSFER (ta, 1);
1446 return 1; 1694 return 1;
1447 } 1695 }
1448 else 1696 else
1449 return 0; 1697 return 0;
1450} 1698}
1451 1699
1452static int 1700static void
1453api_cede_notself (void)
1454{
1455 dTHX;
1456 struct transfer_args ta;
1457
1458 if (prepare_cede_notself (aTHX_ &ta))
1459 {
1460 TRANSFER (ta);
1461 return 1;
1462 }
1463 else
1464 return 0;
1465}
1466
1467static void
1468api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1469{ 1702{
1470 dTHX;
1471 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1472 1704
1473 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1474 { 1706 {
1475 if (!coro->cctx) 1707 if (!coro->cctx)
1476 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1477 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1478 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1479 1711
1480 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1481 } 1713 }
1482 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1483 { 1715 {
… …
1488 else 1720 else
1489 coro->slot->runops = RUNOPS_DEFAULT; 1721 coro->slot->runops = RUNOPS_DEFAULT;
1490 } 1722 }
1491} 1723}
1492 1724
1725/*****************************************************************************/
1726/* PerlIO::cede */
1727
1728typedef struct
1729{
1730 PerlIOBuf base;
1731 NV next, every;
1732} PerlIOCede;
1733
1734static IV
1735PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1736{
1737 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1738
1739 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1740 self->next = nvtime () + self->every;
1741
1742 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1743}
1744
1745static SV *
1746PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1747{
1748 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1749
1750 return newSVnv (self->every);
1751}
1752
1753static IV
1754PerlIOCede_flush (pTHX_ PerlIO *f)
1755{
1756 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1757 double now = nvtime ();
1758
1759 if (now >= self->next)
1760 {
1761 api_cede (aTHX);
1762 self->next = now + self->every;
1763 }
1764
1765 return PerlIOBuf_flush (aTHX_ f);
1766}
1767
1768static PerlIO_funcs PerlIO_cede =
1769{
1770 sizeof(PerlIO_funcs),
1771 "cede",
1772 sizeof(PerlIOCede),
1773 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1774 PerlIOCede_pushed,
1775 PerlIOBuf_popped,
1776 PerlIOBuf_open,
1777 PerlIOBase_binmode,
1778 PerlIOCede_getarg,
1779 PerlIOBase_fileno,
1780 PerlIOBuf_dup,
1781 PerlIOBuf_read,
1782 PerlIOBuf_unread,
1783 PerlIOBuf_write,
1784 PerlIOBuf_seek,
1785 PerlIOBuf_tell,
1786 PerlIOBuf_close,
1787 PerlIOCede_flush,
1788 PerlIOBuf_fill,
1789 PerlIOBase_eof,
1790 PerlIOBase_error,
1791 PerlIOBase_clearerr,
1792 PerlIOBase_setlinebuf,
1793 PerlIOBuf_get_base,
1794 PerlIOBuf_bufsiz,
1795 PerlIOBuf_get_ptr,
1796 PerlIOBuf_get_cnt,
1797 PerlIOBuf_set_ptrcnt,
1798};
1799
1800/*****************************************************************************/
1801
1802static const CV *slf_cv; /* for quick consistency check */
1803
1804static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1805static SV *slf_arg0;
1806static SV *slf_arg1;
1807static SV *slf_arg2;
1808
1809/* this restores the stack in the case we patched the entersub, to */
1810/* recreate the stack frame as perl will on following calls */
1811/* since entersub cleared the stack */
1812static OP *
1813pp_restore (pTHX)
1814{
1815 dSP;
1816
1817 PUSHMARK (SP);
1818
1819 EXTEND (SP, 3);
1820 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1821 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1822 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1823 PUSHs ((SV *)CvGV (slf_cv));
1824
1825 RETURNOP (slf_restore.op_first);
1826}
1827
1828static void
1829slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1830{
1831 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1832}
1833
1834static void
1835slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1836{
1837 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1838
1839 frame->prepare = slf_prepare_set_stacklevel;
1840 frame->check = slf_check_nop;
1841 frame->data = (void *)SvIV (arg [0]);
1842}
1843
1844static void
1845slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1846{
1847 SV **arg = (SV **)slf_frame.data;
1848
1849 prepare_transfer (aTHX_ ta, arg [0], arg [1]);
1850}
1851
1852static void
1853slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 if (items != 2)
1856 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1857
1858 frame->prepare = slf_prepare_transfer;
1859 frame->check = slf_check_nop;
1860 frame->data = (void *)arg; /* let's hope it will stay valid */
1861}
1862
1863static void
1864slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1865{
1866 frame->prepare = prepare_schedule;
1867 frame->check = slf_check_nop;
1868}
1869
1870static void
1871slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 frame->prepare = prepare_cede;
1874 frame->check = slf_check_nop;
1875}
1876
1877static void
1878slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1879{
1880 frame->prepare = prepare_cede_notself;
1881 frame->check = slf_check_nop;
1882}
1883
1884/* we hijack an hopefully unused CV flag for our purposes */
1885#define CVf_SLF 0x4000
1886
1887/*
1888 * these not obviously related functions are all rolled into one
1889 * function to increase chances that they all will call transfer with the same
1890 * stack offset
1891 * SLF stands for "schedule-like-function".
1892 */
1893static OP *
1894pp_slf (pTHX)
1895{
1896 I32 checkmark; /* mark SP to see how many elements check has pushed */
1897
1898 /* set up the slf frame, unless it has already been set-up */
1899 /* the latter happens when a new coro has been started */
1900 /* or when a new cctx was attached to an existing coroutine */
1901 if (expect_true (!slf_frame.prepare))
1902 {
1903 /* first iteration */
1904 dSP;
1905 SV **arg = PL_stack_base + TOPMARK + 1;
1906 int items = SP - arg; /* args without function object */
1907 SV *gv = *sp;
1908
1909 /* do a quick consistency check on the "function" object, and if it isn't */
1910 /* for us, divert to the real entersub */
1911 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1912 return PL_ppaddr[OP_ENTERSUB](aTHX);
1913
1914 /* pop args */
1915 SP = PL_stack_base + POPMARK;
1916
1917 if (!(PL_op->op_flags & OPf_STACKED))
1918 {
1919 /* ampersand-form of call, use @_ instead of stack */
1920 AV *av = GvAV (PL_defgv);
1921 arg = AvARRAY (av);
1922 items = AvFILLp (av) + 1;
1923 }
1924
1925 PUTBACK;
1926
1927 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1928 }
1929
1930 /* now interpret the slf_frame */
1931 /* we use a callback system not to make the code needlessly */
1932 /* complicated, but so we can run multiple perl coros from one cctx */
1933
1934 do
1935 {
1936 struct coro_transfer_args ta;
1937
1938 slf_frame.prepare (aTHX_ &ta);
1939 TRANSFER (ta, 0);
1940
1941 checkmark = PL_stack_sp - PL_stack_base;
1942 }
1943 while (slf_frame.check (aTHX_ &slf_frame));
1944
1945 {
1946 dSP;
1947 SV **bot = PL_stack_base + checkmark;
1948 int gimme = GIMME_V;
1949
1950 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1951
1952 /* make sure we put something on the stack in scalar context */
1953 if (gimme == G_SCALAR)
1954 {
1955 if (sp == bot)
1956 XPUSHs (&PL_sv_undef);
1957
1958 SP = bot + 1;
1959 }
1960
1961 PUTBACK;
1962 }
1963
1964 return NORMAL;
1965}
1966
1967static void
1968api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1969{
1970 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1971
1972 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1973 && PL_op->op_ppaddr != pp_slf)
1974 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1975
1976 if (items > 3)
1977 croak ("Coro only supports up to three arguments to SLF functions currently (not %d), caught", items);
1978
1979 CvFLAGS (cv) |= CVf_SLF;
1980 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1981 slf_cv = cv;
1982
1983 /* we patch the op, and then re-run the whole call */
1984 /* we have to put the same argument on the stack for this to work */
1985 /* and this will be done by pp_restore */
1986 slf_restore.op_next = (OP *)&slf_restore;
1987 slf_restore.op_type = OP_NULL;
1988 slf_restore.op_ppaddr = pp_restore;
1989 slf_restore.op_first = PL_op;
1990
1991 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
1992 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
1993 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
1994
1995 PL_op->op_ppaddr = pp_slf;
1996
1997 PL_op = (OP *)&slf_restore;
1998}
1999
2000/*****************************************************************************/
2001
2002static int
2003slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2004{
2005 AV *av = (AV *)frame->data;
2006 SV *count_sv = AvARRAY (av)[0];
2007
2008 if (SvIVX (count_sv) > 0)
2009 {
2010 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2011 return 0;
2012 }
2013 else
2014 {
2015 int i;
2016 /* if we were woken up but can't down, we look through the whole */
2017 /* waiters list and only add us if we aren't in there already */
2018 /* this avoids some degenerate memory usage cases */
2019
2020 for (i = 1; i <= AvFILLp (av); ++i)
2021 if (AvARRAY (av)[i] == SvRV (coro_current))
2022 return 1;
2023
2024 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2025 return 1;
2026 }
2027}
2028
2029static void
2030slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, SV **arg, int items)
2031{
2032 AV *av = (AV *)SvRV (arg [0]);
2033
2034 if (SvIVX (AvARRAY (av)[0]) > 0)
2035 {
2036 frame->data = (void *)av;
2037 frame->prepare = prepare_nop;
2038 }
2039 else
2040 {
2041 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2042
2043 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2044 frame->prepare = prepare_schedule;
2045 }
2046
2047 frame->check = slf_check_semaphore_down;
2048
2049}
2050
2051/*****************************************************************************/
2052
2053#define GENSUB_ARG CvXSUBANY (cv).any_ptr
2054
2055/* create a closure from XS, returns a code reference */
2056/* the arg can be accessed via GENSUB_ARG from the callback */
2057/* the callback must use dXSARGS/XSRETURN */
2058static SV *
2059gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
2060{
2061 CV *cv = (CV *)NEWSV (0, 0);
2062
2063 sv_upgrade ((SV *)cv, SVt_PVCV);
2064
2065 CvANON_on (cv);
2066 CvISXSUB_on (cv);
2067 CvXSUB (cv) = xsub;
2068 GENSUB_ARG = arg;
2069
2070 return newRV_noinc ((SV *)cv);
2071}
2072
2073/*****************************************************************************/
2074
1493MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2075MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1494 2076
1495PROTOTYPES: DISABLE 2077PROTOTYPES: DISABLE
1496 2078
1497BOOT: 2079BOOT:
1498{ 2080{
1499#ifdef USE_ITHREADS 2081#ifdef USE_ITHREADS
1500 MUTEX_INIT (&coro_mutex); 2082 MUTEX_INIT (&coro_lock);
2083# if CORO_PTHREAD
2084 coro_thx = PERL_GET_CONTEXT;
2085# endif
1501#endif 2086#endif
1502 BOOT_PAGESIZE; 2087 BOOT_PAGESIZE;
1503 2088
1504 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2089 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1505 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2090 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1506 2091
2092 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2093 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2094 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2095
1507 hv_sig = coro_get_hv ("SIG", TRUE); 2096 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1508 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 2097 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1509 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 2098 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1510
1511 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1512 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1513 2099
1514 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 2100 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1515 2101
1516 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 2102 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1517 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 2103 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1522 main_top_env = PL_top_env; 2108 main_top_env = PL_top_env;
1523 2109
1524 while (main_top_env->je_prev) 2110 while (main_top_env->je_prev)
1525 main_top_env = main_top_env->je_prev; 2111 main_top_env = main_top_env->je_prev;
1526 2112
1527 coroapi.ver = CORO_API_VERSION; 2113 coroapi.ver = CORO_API_VERSION;
2114 coroapi.rev = CORO_API_REVISION;
2115
1528 coroapi.transfer = api_transfer; 2116 coroapi.transfer = api_transfer;
2117
2118 coroapi.sv_state = SvSTATE_;
2119 coroapi.execute_slf = api_execute_slf;
2120 coroapi.prepare_nop = prepare_nop;
2121 coroapi.prepare_schedule = prepare_schedule;
2122 coroapi.prepare_cede = prepare_cede;
2123 coroapi.prepare_cede_notself = prepare_cede_notself;
2124
2125 {
2126 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2127
2128 if (!svp) croak ("Time::HiRes is required");
2129 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2130
2131 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2132 }
1529 2133
1530 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2134 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1531} 2135}
1532 2136
1533SV * 2137SV *
1534new (char *klass, ...) 2138new (char *klass, ...)
1535 CODE: 2139 CODE:
1536{ 2140{
1537 struct coro *coro; 2141 struct coro *coro;
2142 MAGIC *mg;
1538 HV *hv; 2143 HV *hv;
1539 int i; 2144 int i;
1540 2145
1541 Newz (0, coro, 1, struct coro); 2146 Newz (0, coro, 1, struct coro);
1542 coro->args = newAV (); 2147 coro->args = newAV ();
… …
1545 if (coro_first) coro_first->prev = coro; 2150 if (coro_first) coro_first->prev = coro;
1546 coro->next = coro_first; 2151 coro->next = coro_first;
1547 coro_first = coro; 2152 coro_first = coro;
1548 2153
1549 coro->hv = hv = newHV (); 2154 coro->hv = hv = newHV ();
1550 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 2155 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2156 mg->mg_flags |= MGf_DUP;
1551 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2157 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1552 2158
1553 av_extend (coro->args, items - 1); 2159 av_extend (coro->args, items - 1);
1554 for (i = 1; i < items; i++) 2160 for (i = 1; i < items; i++)
1555 av_push (coro->args, newSVsv (ST (i))); 2161 av_push (coro->args, newSVsv (ST (i)));
1556} 2162}
1557 OUTPUT: 2163 OUTPUT:
1558 RETVAL 2164 RETVAL
1559 2165
1560# these not obviously related functions are all rolled into the same xs
1561# function to increase chances that they all will call transfer with the same
1562# stack offset
1563void 2166void
1564_set_stacklevel (...) 2167_set_stacklevel (...)
1565 ALIAS: 2168 CODE:
1566 Coro::State::transfer = 1 2169 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1567 Coro::schedule = 2
1568 Coro::cede = 3
1569 Coro::cede_notself = 4
1570 CODE:
1571{
1572 struct transfer_args ta;
1573 2170
1574 switch (ix) 2171void
1575 { 2172transfer (...)
1576 case 0: 2173 PROTOTYPE: $$
1577 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2174 CODE:
1578 ta.next = 0; 2175 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1579 break;
1580
1581 case 1:
1582 if (items != 2)
1583 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1584
1585 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1586 break;
1587
1588 case 2:
1589 prepare_schedule (aTHX_ &ta);
1590 break;
1591
1592 case 3:
1593 prepare_cede (aTHX_ &ta);
1594 break;
1595
1596 case 4:
1597 if (!prepare_cede_notself (aTHX_ &ta))
1598 XSRETURN_EMPTY;
1599
1600 break;
1601 }
1602
1603 BARRIER;
1604 TRANSFER (ta);
1605
1606 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1607 XSRETURN_YES;
1608}
1609 2176
1610bool 2177bool
1611_destroy (SV *coro_sv) 2178_destroy (SV *coro_sv)
1612 CODE: 2179 CODE:
1613 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2180 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1614 OUTPUT: 2181 OUTPUT:
1615 RETVAL 2182 RETVAL
1616 2183
1617void 2184void
1618_exit (code) 2185_exit (int code)
1619 int code
1620 PROTOTYPE: $ 2186 PROTOTYPE: $
1621 CODE: 2187 CODE:
1622 _exit (code); 2188 _exit (code);
1623 2189
1624int 2190int
1625cctx_stacksize (int new_stacksize = 0) 2191cctx_stacksize (int new_stacksize = 0)
2192 PROTOTYPE: ;$
1626 CODE: 2193 CODE:
1627 RETVAL = coro_stacksize; 2194 RETVAL = cctx_stacksize;
1628 if (new_stacksize) 2195 if (new_stacksize)
2196 {
1629 coro_stacksize = new_stacksize; 2197 cctx_stacksize = new_stacksize;
2198 ++cctx_gen;
2199 }
1630 OUTPUT: 2200 OUTPUT:
1631 RETVAL 2201 RETVAL
1632 2202
1633int 2203int
2204cctx_max_idle (int max_idle = 0)
2205 PROTOTYPE: ;$
2206 CODE:
2207 RETVAL = cctx_max_idle;
2208 if (max_idle > 1)
2209 cctx_max_idle = max_idle;
2210 OUTPUT:
2211 RETVAL
2212
2213int
1634cctx_count () 2214cctx_count ()
2215 PROTOTYPE:
1635 CODE: 2216 CODE:
1636 RETVAL = cctx_count; 2217 RETVAL = cctx_count;
1637 OUTPUT: 2218 OUTPUT:
1638 RETVAL 2219 RETVAL
1639 2220
1640int 2221int
1641cctx_idle () 2222cctx_idle ()
2223 PROTOTYPE:
1642 CODE: 2224 CODE:
1643 RETVAL = cctx_idle; 2225 RETVAL = cctx_idle;
1644 OUTPUT: 2226 OUTPUT:
1645 RETVAL 2227 RETVAL
1646 2228
1647void 2229void
1648list () 2230list ()
2231 PROTOTYPE:
1649 PPCODE: 2232 PPCODE:
1650{ 2233{
1651 struct coro *coro; 2234 struct coro *coro;
1652 for (coro = coro_first; coro; coro = coro->next) 2235 for (coro = coro_first; coro; coro = coro->next)
1653 if (coro->hv) 2236 if (coro->hv)
… …
1658call (Coro::State coro, SV *coderef) 2241call (Coro::State coro, SV *coderef)
1659 ALIAS: 2242 ALIAS:
1660 eval = 1 2243 eval = 1
1661 CODE: 2244 CODE:
1662{ 2245{
1663 if (coro->mainstack) 2246 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1664 { 2247 {
1665 struct coro temp; 2248 struct coro temp;
1666 2249
1667 if (!(coro->flags & CF_RUNNING)) 2250 if (!(coro->flags & CF_RUNNING))
1668 { 2251 {
2252 PUTBACK;
1669 save_perl (aTHX_ &temp); 2253 save_perl (aTHX_ &temp);
1670 load_perl (aTHX_ coro); 2254 load_perl (aTHX_ coro);
1671 } 2255 }
1672 2256
1673 { 2257 {
1674 dSP; 2258 dSP;
1675 ENTER; 2259 ENTER;
1676 SAVETMPS; 2260 SAVETMPS;
2261 PUTBACK;
2262 PUSHSTACK;
1677 PUSHMARK (SP); 2263 PUSHMARK (SP);
1678 PUTBACK;
1679 2264
1680 if (ix) 2265 if (ix)
1681 eval_sv (coderef, 0); 2266 eval_sv (coderef, 0);
1682 else 2267 else
1683 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 2268 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1684 2269
2270 POPSTACK;
1685 SPAGAIN; 2271 SPAGAIN;
1686 FREETMPS; 2272 FREETMPS;
1687 LEAVE; 2273 LEAVE;
1688 PUTBACK; 2274 PUTBACK;
1689 } 2275 }
1690 2276
1691 if (!(coro->flags & CF_RUNNING)) 2277 if (!(coro->flags & CF_RUNNING))
1692 { 2278 {
1693 save_perl (aTHX_ coro); 2279 save_perl (aTHX_ coro);
1694 load_perl (aTHX_ &temp); 2280 load_perl (aTHX_ &temp);
2281 SPAGAIN;
1695 } 2282 }
1696 } 2283 }
1697} 2284}
1698 2285
1699SV * 2286SV *
… …
1708 RETVAL = boolSV (coro->flags & ix); 2295 RETVAL = boolSV (coro->flags & ix);
1709 OUTPUT: 2296 OUTPUT:
1710 RETVAL 2297 RETVAL
1711 2298
1712void 2299void
2300throw (Coro::State self, SV *throw = &PL_sv_undef)
2301 PROTOTYPE: $;$
2302 CODE:
2303 SvREFCNT_dec (self->throw);
2304 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2305
2306void
1713api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2307api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2308 PROTOTYPE: $;$
2309 C_ARGS: aTHX_ coro, flags
1714 2310
1715SV * 2311SV *
1716has_stack (Coro::State coro) 2312has_cctx (Coro::State coro)
1717 PROTOTYPE: $ 2313 PROTOTYPE: $
1718 CODE: 2314 CODE:
1719 RETVAL = boolSV (!!coro->cctx); 2315 RETVAL = boolSV (!!coro->cctx);
1720 OUTPUT: 2316 OUTPUT:
1721 RETVAL 2317 RETVAL
… …
1726 CODE: 2322 CODE:
1727 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2323 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1728 OUTPUT: 2324 OUTPUT:
1729 RETVAL 2325 RETVAL
1730 2326
1731IV 2327UV
1732rss (Coro::State coro) 2328rss (Coro::State coro)
1733 PROTOTYPE: $ 2329 PROTOTYPE: $
1734 ALIAS: 2330 ALIAS:
1735 usecount = 1 2331 usecount = 1
1736 CODE: 2332 CODE:
… …
1740 case 1: RETVAL = coro->usecount; break; 2336 case 1: RETVAL = coro->usecount; break;
1741 } 2337 }
1742 OUTPUT: 2338 OUTPUT:
1743 RETVAL 2339 RETVAL
1744 2340
2341void
2342force_cctx ()
2343 PROTOTYPE:
2344 CODE:
2345 struct coro *coro = SvSTATE (coro_current);
2346 coro->cctx->idle_sp = 0;
2347
2348void
2349swap_defsv (Coro::State self)
2350 PROTOTYPE: $
2351 ALIAS:
2352 swap_defav = 1
2353 CODE:
2354 if (!self->slot)
2355 croak ("cannot swap state with coroutine that has no saved state,");
2356 else
2357 {
2358 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2359 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2360
2361 SV *tmp = *src; *src = *dst; *dst = tmp;
2362 }
1745 2363
1746MODULE = Coro::State PACKAGE = Coro 2364MODULE = Coro::State PACKAGE = Coro
1747 2365
1748BOOT: 2366BOOT:
1749{ 2367{
1750 int i; 2368 int i;
1751 2369
1752 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1753 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1754 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2370 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2371 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2372 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1755 2373
1756 coro_current = coro_get_sv ("Coro::current", FALSE); 2374 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1757 SvREADONLY_on (coro_current); 2375 SvREADONLY_on (coro_current);
1758 2376
1759 coro_stash = gv_stashpv ("Coro", TRUE); 2377 coro_stash = gv_stashpv ("Coro", TRUE);
1760 2378
1761 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2379 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1767 2385
1768 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2386 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1769 coro_ready[i] = newAV (); 2387 coro_ready[i] = newAV ();
1770 2388
1771 { 2389 {
1772 SV *sv = perl_get_sv ("Coro::API", TRUE); 2390 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1773 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1774 2391
1775 coroapi.schedule = api_schedule; 2392 coroapi.schedule = api_schedule;
1776 coroapi.cede = api_cede; 2393 coroapi.cede = api_cede;
1777 coroapi.cede_notself = api_cede_notself; 2394 coroapi.cede_notself = api_cede_notself;
1778 coroapi.ready = api_ready; 2395 coroapi.ready = api_ready;
1779 coroapi.is_ready = api_is_ready; 2396 coroapi.is_ready = api_is_ready;
1780 coroapi.nready = &coro_nready; 2397 coroapi.nready = coro_nready;
1781 coroapi.current = coro_current; 2398 coroapi.current = coro_current;
1782 2399
1783 GCoroAPI = &coroapi; 2400 GCoroAPI = &coroapi;
1784 sv_setiv (sv, (IV)&coroapi); 2401 sv_setiv (sv, (IV)&coroapi);
1785 SvREADONLY_on (sv); 2402 SvREADONLY_on (sv);
1786 } 2403 }
1787} 2404}
2405
2406void
2407schedule (...)
2408 CODE:
2409 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), 0);
2410
2411void
2412cede (...)
2413 CODE:
2414 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), 0);
2415
2416void
2417cede_notself (...)
2418 CODE:
2419 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), 0);
1788 2420
1789void 2421void
1790_set_current (SV *current) 2422_set_current (SV *current)
1791 PROTOTYPE: $ 2423 PROTOTYPE: $
1792 CODE: 2424 CODE:
1793 SvREFCNT_dec (SvRV (coro_current)); 2425 SvREFCNT_dec (SvRV (coro_current));
1794 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2426 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2427
2428void
2429_set_readyhook (SV *hook)
2430 PROTOTYPE: $
2431 CODE:
2432 LOCK;
2433 SvREFCNT_dec (coro_readyhook);
2434 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2435 UNLOCK;
1795 2436
1796int 2437int
1797prio (Coro::State coro, int newprio = 0) 2438prio (Coro::State coro, int newprio = 0)
2439 PROTOTYPE: $;$
1798 ALIAS: 2440 ALIAS:
1799 nice = 1 2441 nice = 1
1800 CODE: 2442 CODE:
1801{ 2443{
1802 RETVAL = coro->prio; 2444 RETVAL = coro->prio;
… …
1817 2459
1818SV * 2460SV *
1819ready (SV *self) 2461ready (SV *self)
1820 PROTOTYPE: $ 2462 PROTOTYPE: $
1821 CODE: 2463 CODE:
1822 RETVAL = boolSV (api_ready (self)); 2464 RETVAL = boolSV (api_ready (aTHX_ self));
1823 OUTPUT: 2465 OUTPUT:
1824 RETVAL 2466 RETVAL
1825 2467
1826int 2468int
1827nready (...) 2469nready (...)
… …
1829 CODE: 2471 CODE:
1830 RETVAL = coro_nready; 2472 RETVAL = coro_nready;
1831 OUTPUT: 2473 OUTPUT:
1832 RETVAL 2474 RETVAL
1833 2475
1834void
1835throw (Coro::State self, SV *throw = &PL_sv_undef)
1836 PROTOTYPE: $;$
1837 CODE:
1838 SvREFCNT_dec (self->throw);
1839 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1840
1841# for async_pool speedup 2476# for async_pool speedup
1842void 2477void
1843_pool_1 (SV *cb) 2478_pool_1 (SV *cb)
1844 CODE: 2479 CODE:
1845{ 2480{
1846 struct coro *coro = SvSTATE (coro_current); 2481 struct coro *coro = SvSTATE (coro_current);
1847 HV *hv = (HV *)SvRV (coro_current); 2482 HV *hv = (HV *)SvRV (coro_current);
1848 AV *defav = GvAV (PL_defgv); 2483 AV *defav = GvAV (PL_defgv);
1849 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2484 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1850 AV *invoke_av; 2485 AV *invoke_av;
1851 int i, len; 2486 int i, len;
1852 2487
1853 if (!invoke) 2488 if (!invoke)
2489 {
2490 SV *old = PL_diehook;
2491 PL_diehook = 0;
2492 SvREFCNT_dec (old);
1854 croak ("\3async_pool terminate\2\n"); 2493 croak ("\3async_pool terminate\2\n");
2494 }
1855 2495
1856 SvREFCNT_dec (coro->saved_deffh); 2496 SvREFCNT_dec (coro->saved_deffh);
1857 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2497 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1858 2498
1859 hv_store (hv, "desc", sizeof ("desc") - 1, 2499 hv_store (hv, "desc", sizeof ("desc") - 1,
1860 newSVpvn (strpair ("[async_pool]")), 0); 2500 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1861 2501
1862 invoke_av = (AV *)SvRV (invoke); 2502 invoke_av = (AV *)SvRV (invoke);
1863 len = av_len (invoke_av); 2503 len = av_len (invoke_av);
1864 2504
1865 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2505 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1866 2506
1867 if (len > 0) 2507 if (len > 0)
1868 { 2508 {
1869 av_fill (defav, len - 1); 2509 av_fill (defav, len - 1);
1870 for (i = 0; i < len; ++i) 2510 for (i = 0; i < len; ++i)
1871 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2511 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1872 } 2512 }
1873
1874 SvREFCNT_dec (invoke);
1875} 2513}
1876 2514
1877void 2515void
1878_pool_2 (SV *cb) 2516_pool_2 (SV *cb)
1879 CODE: 2517 CODE:
… …
1883 sv_setsv (cb, &PL_sv_undef); 2521 sv_setsv (cb, &PL_sv_undef);
1884 2522
1885 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2523 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1886 coro->saved_deffh = 0; 2524 coro->saved_deffh = 0;
1887 2525
1888 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2526 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1889 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2527 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2528 {
2529 SV *old = PL_diehook;
2530 PL_diehook = 0;
2531 SvREFCNT_dec (old);
1890 croak ("\3async_pool terminate\2\n"); 2532 croak ("\3async_pool terminate\2\n");
2533 }
1891 2534
1892 av_clear (GvAV (PL_defgv)); 2535 av_clear (GvAV (PL_defgv));
1893 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2536 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1894 newSVpvn (strpair ("[async_pool idle]")), 0); 2537 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1895 2538
1896 coro->prio = 0; 2539 coro->prio = 0;
1897 2540
1898 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2541 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1899 api_trace (coro_current, 0); 2542 api_trace (aTHX_ coro_current, 0);
1900 2543
1901 av_push (av_async_pool, newSVsv (coro_current)); 2544 av_push (av_async_pool, newSVsv (coro_current));
1902} 2545}
1903 2546
1904 2547
1905MODULE = Coro::State PACKAGE = Coro::AIO 2548MODULE = Coro::State PACKAGE = Coro::AIO
1906 2549
1907SV * 2550void
1908_get_state () 2551_get_state (SV *self)
2552 PROTOTYPE: $
1909 CODE: 2553 PPCODE:
1910{ 2554{
1911 struct io_state *data; 2555 AV *defav = GvAV (PL_defgv);
1912 2556 AV *av = newAV ();
2557 int i;
1913 RETVAL = newSV (sizeof (struct io_state)); 2558 SV *data_sv = newSV (sizeof (struct io_state));
1914 data = (struct io_state *)SvPVX (RETVAL); 2559 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1915 SvCUR_set (RETVAL, sizeof (struct io_state)); 2560 SvCUR_set (data_sv, sizeof (struct io_state));
1916 SvPOK_only (RETVAL); 2561 SvPOK_only (data_sv);
1917 2562
1918 data->errorno = errno; 2563 data->errorno = errno;
1919 data->laststype = PL_laststype; 2564 data->laststype = PL_laststype;
1920 data->laststatval = PL_laststatval; 2565 data->laststatval = PL_laststatval;
1921 data->statcache = PL_statcache; 2566 data->statcache = PL_statcache;
2567
2568 av_extend (av, AvFILLp (defav) + 1 + 1);
2569
2570 for (i = 0; i <= AvFILLp (defav); ++i)
2571 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2572
2573 av_push (av, data_sv);
2574
2575 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2576
2577 api_ready (aTHX_ self);
1922} 2578}
1923 OUTPUT:
1924 RETVAL
1925 2579
1926void 2580void
1927_set_state (char *data_) 2581_set_state (SV *state)
1928 PROTOTYPE: $ 2582 PROTOTYPE: $
1929 CODE: 2583 PPCODE:
1930{ 2584{
1931 struct io_state *data = (void *)data_; 2585 AV *av = (AV *)SvRV (state);
2586 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2587 int i;
1932 2588
1933 errno = data->errorno; 2589 errno = data->errorno;
1934 PL_laststype = data->laststype; 2590 PL_laststype = data->laststype;
1935 PL_laststatval = data->laststatval; 2591 PL_laststatval = data->laststatval;
1936 PL_statcache = data->statcache; 2592 PL_statcache = data->statcache;
1937}
1938 2593
2594 EXTEND (SP, AvFILLp (av));
2595 for (i = 0; i < AvFILLp (av); ++i)
2596 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2597}
2598
2599
2600MODULE = Coro::State PACKAGE = Coro::AnyEvent
2601
2602BOOT:
2603 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2604
2605void
2606_schedule (...)
2607 CODE:
2608{
2609 static int incede;
2610
2611 api_cede_notself (aTHX);
2612
2613 ++incede;
2614 while (coro_nready >= incede && api_cede (aTHX))
2615 ;
2616
2617 sv_setsv (sv_activity, &PL_sv_undef);
2618 if (coro_nready >= incede)
2619 {
2620 PUSHMARK (SP);
2621 PUTBACK;
2622 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2623 SPAGAIN;
2624 }
2625
2626 --incede;
2627}
2628
2629
2630MODULE = Coro::State PACKAGE = PerlIO::cede
2631
2632BOOT:
2633 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2634
2635MODULE = Coro::State PACKAGE = Coro::Semaphore
2636
2637SV *
2638new (SV *klass, SV *count_ = 0)
2639 CODE:
2640{
2641 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2642 AV *av = newAV ();
2643 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1));
2644 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2645}
2646 OUTPUT:
2647 RETVAL
2648
2649SV *
2650count (SV *self)
2651 CODE:
2652 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2653 OUTPUT:
2654 RETVAL
2655
2656void
2657up (SV *self, int adjust = 1)
2658 ALIAS:
2659 adjust = 1
2660 CODE:
2661{
2662 AV *av = (AV *)SvRV (self);
2663 SV *count_sv = AvARRAY (av)[0];
2664 IV count = SvIVX (count_sv);
2665
2666 count += ix ? adjust : 1;
2667 SvIVX (count_sv) = count;
2668
2669 /* now wake up as many waiters as possible */
2670 while (count > 0 && AvFILLp (av) >= count)
2671 {
2672 SV *cb;
2673
2674 /* swap first two elements so we can shift a waiter */
2675 AvARRAY (av)[0] = AvARRAY (av)[1];
2676 AvARRAY (av)[1] = count_sv;
2677 cb = av_shift (av);
2678
2679 if (SvOBJECT (cb))
2680 api_ready (aTHX_ cb);
2681 else
2682 croak ("callbacks not yet supported");
2683
2684 SvREFCNT_dec (cb);
2685 }
2686}
2687
2688void
2689down (SV *self)
2690 CODE:
2691 api_execute_slf (aTHX_ cv, slf_init_semaphore_down, &ST (0), 1);
2692
2693void
2694try (SV *self)
2695 PPCODE:
2696{
2697 AV *av = (AV *)SvRV (self);
2698 SV *count_sv = AvARRAY (av)[0];
2699 IV count = SvIVX (count_sv);
2700
2701 if (count > 0)
2702 {
2703 --count;
2704 SvIVX (count_sv) = count;
2705 XSRETURN_YES;
2706 }
2707 else
2708 XSRETURN_NO;
2709}
2710
2711void
2712waiters (SV *self)
2713 CODE:
2714{
2715 AV *av = (AV *)SvRV (self);
2716
2717 if (GIMME_V == G_SCALAR)
2718 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2719 else
2720 {
2721 int i;
2722 EXTEND (SP, AvFILLp (av) + 1 - 1);
2723 for (i = 1; i <= AvFILLp (av); ++i)
2724 PUSHs (newSVsv (AvARRAY (av)[i]));
2725 }
2726}
2727

Diff Legend

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