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.44 by root, Sat Mar 22 18:50:32 2003 UTC vs.
Revision 1.66 by root, Mon Dec 12 19:43:41 2005 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "libcoro/coro.c" 9#include "patchlevel.h"
10
11#if PERL_VERSION < 6
12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr
14# endif
15# ifndef call_sv
16# define call_sv perl_call_sv
17# endif
18# ifndef get_sv
19# define get_sv perl_get_sv
20# endif
21# ifndef get_cv
22# define get_cv perl_get_cv
23# endif
24# ifndef IS_PADGV
25# define IS_PADGV(v) 0
26# endif
27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0
29# endif
30#endif
6 31
7#include <signal.h> 32#include <signal.h>
8 33
9#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
10# include <unistd.h> 35# include <unistd.h>
… …
16# undef HAVE_MMAP 41# undef HAVE_MMAP
17# endif 42# endif
18# endif 43# endif
19#endif 44#endif
20 45
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
25 48
26/* The next macro should declare a variable stacklevel that contains and approximation 49/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 50 * to the current C stack pointer. Its property is that it changes with each call
… …
32 55
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
34 57
35#include "CoroAPI.h" 58#include "CoroAPI.h"
36 59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else
65# define LOCK 0
66# define UNLOCK 0
67#endif
68
37static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
38 75
39/* this is actually not only the c stack but also c registers etc... */ 76/* this is actually not only the c stack but also c registers etc... */
40typedef struct { 77typedef struct {
41 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
42 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
… …
47 void *sptr; 84 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 85 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 86} coro_stack;
50 87
51struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
52 /* the optional C context */ 92 /* the optional C context */
53 coro_stack *stack; 93 coro_stack *stack;
54 void *cursp; 94 void *cursp;
55 int gencnt; 95 int gencnt;
56 96
… …
69 AV *mainstack; 109 AV *mainstack;
70 SV **stack_sp; 110 SV **stack_sp;
71 OP *op; 111 OP *op;
72 SV **curpad; 112 SV **curpad;
73 AV *comppad; 113 AV *comppad;
114 CV *compcv;
74 SV **stack_base; 115 SV **stack_base;
75 SV **stack_max; 116 SV **stack_max;
76 SV **tmps_stack; 117 SV **tmps_stack;
77 I32 tmps_floor; 118 I32 tmps_floor;
78 I32 tmps_ix; 119 I32 tmps_ix;
… …
87 I32 savestack_ix; 128 I32 savestack_ix;
88 I32 savestack_max; 129 I32 savestack_max;
89 OP **retstack; 130 OP **retstack;
90 I32 retstack_ix; 131 I32 retstack_ix;
91 I32 retstack_max; 132 I32 retstack_max;
133 PMOP *curpm;
92 COP *curcop; 134 COP *curcop;
93 JMPENV *top_env; 135 JMPENV *top_env;
94 136
95 /* data associated with this coroutine (initial args) */ 137 /* data associated with this coroutine (initial args) */
96 AV *args; 138 AV *args;
97}; 139};
98 140
99typedef struct coro *Coro__State; 141typedef struct coro *Coro__State;
100typedef struct coro *Coro__State_or_hashref; 142typedef struct coro *Coro__State_or_hashref;
101 143
102static AV *main_mainstack; /* used to differentiate between $main and others */
103static HV *coro_state_stash;
104static SV *ucoro_state_sv;
105static U32 ucoro_state_hash;
106static HV *padlist_cache;
107static SV *coro_mortal; /* will be freed after next transfer */
108
109/* mostly copied from op.c:cv_clone2 */ 144/* mostly copied from op.c:cv_clone2 */
110STATIC AV * 145STATIC AV *
111clone_padlist (AV *protopadlist) 146clone_padlist (pTHX_ AV *protopadlist)
112{ 147{
113 AV *av; 148 AV *av;
114 I32 ix; 149 I32 ix;
115 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 150 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
116 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 151 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
… …
140 AvFLAGS (av) = AVf_REIFY; 175 AvFLAGS (av) = AVf_REIFY;
141 176
142 for (ix = fpad; ix > 0; ix--) 177 for (ix = fpad; ix > 0; ix--)
143 { 178 {
144 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 179 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
180
145 if (namesv && namesv != &PL_sv_undef) 181 if (namesv && namesv != &PL_sv_undef)
146 { 182 {
147 char *name = SvPVX (namesv); /* XXX */ 183 char *name = SvPVX (namesv); /* XXX */
184
148 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 185 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
149 { /* lexical from outside? */ 186 { /* lexical from outside? */
150 npad[ix] = SvREFCNT_inc (ppad[ix]); 187 npad[ix] = SvREFCNT_inc (ppad[ix]);
151 } 188 }
152 else 189 else
… …
158 sv = (SV *) newAV (); 195 sv = (SV *) newAV ();
159 else if (*name == '%') 196 else if (*name == '%')
160 sv = (SV *) newHV (); 197 sv = (SV *) newHV ();
161 else 198 else
162 sv = NEWSV (0, 0); 199 sv = NEWSV (0, 0);
200
201#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 202 if (!SvPADBUSY (sv))
203#endif
164 SvPADMY_on (sv); 204 SvPADMY_on (sv);
205
165 npad[ix] = sv; 206 npad[ix] = sv;
166 } 207 }
167 } 208 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 209 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
169 { 210 {
… …
198#endif 239#endif
199 240
200 return newpadlist; 241 return newpadlist;
201} 242}
202 243
203#ifdef MAY_FLUSH
204STATIC void 244STATIC void
205free_padlist (AV *padlist) 245free_padlist (pTHX_ AV *padlist)
206{ 246{
207 /* may be during global destruction */ 247 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 248 if (SvREFCNT (padlist))
209 { 249 {
210 I32 i = AvFILLp(padlist); 250 I32 i = AvFILLp (padlist);
211 while (i >= 0) 251 while (i >= 0)
212 { 252 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 253 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 254 if (svp)
255 {
256 SV *sv;
257 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 258 SvREFCNT_dec (sv);
259
260 SvREFCNT_dec (*svp);
261 }
217 } 262 }
218 263
219 SvREFCNT_dec((SV*)padlist); 264 SvREFCNT_dec ((SV*)padlist);
220 } 265 }
221} 266}
222#endif 267
268STATIC int
269coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
270{
271 AV *padlist;
272 AV *av = (AV *)mg->mg_obj;
273
274 /* casting is fun. */
275 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
276 free_padlist (aTHX_ padlist);
277
278 SvREFCNT_dec (av);
279}
280
281#define PERL_MAGIC_coro PERL_MAGIC_ext
282
283static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
223 284
224/* the next two functions merely cache the padlists */ 285/* the next two functions merely cache the padlists */
225STATIC void 286STATIC void
226get_padlist (CV *cv) 287get_padlist (pTHX_ CV *cv)
227{ 288{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 289 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 290
230 if (he && AvFILLp ((AV *)*he) >= 0) 291 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 292 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 293 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 294 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
234} 295}
235 296
236STATIC void 297STATIC void
237put_padlist (CV *cv) 298put_padlist (pTHX_ CV *cv)
238{ 299{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 300 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 301
241 if (SvTYPE (*he) != SVt_PVAV) 302 if (!mg)
242 { 303 {
243 SvREFCNT_dec (*he); 304 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
305 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
306 mg->mg_virtual = &vtbl_coro;
244 *he = (SV *)newAV (); 307 mg->mg_obj = (SV *)newAV ();
245 } 308 }
246 309
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 310 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 311}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 312
276#define SB do { 313#define SB do {
277#define SE } while (0) 314#define SE } while (0)
278 315
279#define LOAD(state) load_state(aTHX_ (state)); 316#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 317#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 318
282#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 319#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
283 320
284static void 321static void
285load_state(pTHX_ Coro__State c) 322load_state(pTHX_ Coro__State c)
286{ 323{
287 PL_dowarn = c->dowarn; 324 PL_dowarn = c->dowarn;
… …
292 PL_mainstack = c->mainstack; 329 PL_mainstack = c->mainstack;
293 PL_stack_sp = c->stack_sp; 330 PL_stack_sp = c->stack_sp;
294 PL_op = c->op; 331 PL_op = c->op;
295 PL_curpad = c->curpad; 332 PL_curpad = c->curpad;
296 PL_comppad = c->comppad; 333 PL_comppad = c->comppad;
334 PL_compcv = c->compcv;
297 PL_stack_base = c->stack_base; 335 PL_stack_base = c->stack_base;
298 PL_stack_max = c->stack_max; 336 PL_stack_max = c->stack_max;
299 PL_tmps_stack = c->tmps_stack; 337 PL_tmps_stack = c->tmps_stack;
300 PL_tmps_floor = c->tmps_floor; 338 PL_tmps_floor = c->tmps_floor;
301 PL_tmps_ix = c->tmps_ix; 339 PL_tmps_ix = c->tmps_ix;
… …
310 PL_savestack_ix = c->savestack_ix; 348 PL_savestack_ix = c->savestack_ix;
311 PL_savestack_max = c->savestack_max; 349 PL_savestack_max = c->savestack_max;
312 PL_retstack = c->retstack; 350 PL_retstack = c->retstack;
313 PL_retstack_ix = c->retstack_ix; 351 PL_retstack_ix = c->retstack_ix;
314 PL_retstack_max = c->retstack_max; 352 PL_retstack_max = c->retstack_max;
353 PL_curpm = c->curpm;
315 PL_curcop = c->curcop; 354 PL_curcop = c->curcop;
316 PL_top_env = c->top_env; 355 PL_top_env = c->top_env;
317 356
318 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 357 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
319 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 358 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
328 { 367 {
329 AV *padlist = (AV *)POPs; 368 AV *padlist = (AV *)POPs;
330 369
331 if (padlist) 370 if (padlist)
332 { 371 {
333 put_padlist (cv); /* mark this padlist as available */ 372 put_padlist (aTHX_ cv); /* mark this padlist as available */
334 CvPADLIST(cv) = padlist; 373 CvPADLIST(cv) = padlist;
335#ifdef USE_THREADS
336 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
337#endif
338 } 374 }
339 375
340 ++CvDEPTH(cv); 376 ++CvDEPTH(cv);
341 } 377 }
342 378
… …
369 if (CxTYPE(cx) == CXt_SUB) 405 if (CxTYPE(cx) == CXt_SUB)
370 { 406 {
371 CV *cv = cx->blk_sub.cv; 407 CV *cv = cx->blk_sub.cv;
372 if (CvDEPTH(cv)) 408 if (CvDEPTH(cv))
373 { 409 {
374#ifdef USE_THREADS
375 /*XPUSHs ((SV *)CvOWNER(cv));*/
376 /*CvOWNER(cv) = 0;*/
377 /*error must unlock this cv etc.. etc...*/
378#endif
379 EXTEND (SP, CvDEPTH(cv)*2); 410 EXTEND (SP, CvDEPTH(cv)*2);
380 411
381 while (--CvDEPTH(cv)) 412 while (--CvDEPTH(cv))
382 { 413 {
383 /* this tells the restore code to increment CvDEPTH */ 414 /* this tells the restore code to increment CvDEPTH */
… …
386 } 417 }
387 418
388 PUSHs ((SV *)CvPADLIST(cv)); 419 PUSHs ((SV *)CvPADLIST(cv));
389 PUSHs ((SV *)cv); 420 PUSHs ((SV *)cv);
390 421
391 get_padlist (cv); /* this is a monster */ 422 get_padlist (aTHX_ cv); /* this is a monster */
392 } 423 }
393 } 424 }
425#ifdef CXt_FORMAT
394 else if (CxTYPE(cx) == CXt_FORMAT) 426 else if (CxTYPE(cx) == CXt_FORMAT)
395 { 427 {
396 /* I never used formats, so how should I know how these are implemented? */ 428 /* I never used formats, so how should I know how these are implemented? */
397 /* my bold guess is as a simple, plain sub... */ 429 /* my bold guess is as a simple, plain sub... */
398 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 430 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
399 } 431 }
432#endif
400 } 433 }
401 434
402 if (top_si->si_type == PERLSI_MAIN) 435 if (top_si->si_type == PERLSI_MAIN)
403 break; 436 break;
404 437
… …
422 c->mainstack = PL_mainstack; 455 c->mainstack = PL_mainstack;
423 c->stack_sp = PL_stack_sp; 456 c->stack_sp = PL_stack_sp;
424 c->op = PL_op; 457 c->op = PL_op;
425 c->curpad = PL_curpad; 458 c->curpad = PL_curpad;
426 c->comppad = PL_comppad; 459 c->comppad = PL_comppad;
460 c->compcv = PL_compcv;
427 c->stack_base = PL_stack_base; 461 c->stack_base = PL_stack_base;
428 c->stack_max = PL_stack_max; 462 c->stack_max = PL_stack_max;
429 c->tmps_stack = PL_tmps_stack; 463 c->tmps_stack = PL_tmps_stack;
430 c->tmps_floor = PL_tmps_floor; 464 c->tmps_floor = PL_tmps_floor;
431 c->tmps_ix = PL_tmps_ix; 465 c->tmps_ix = PL_tmps_ix;
… …
440 c->savestack_ix = PL_savestack_ix; 474 c->savestack_ix = PL_savestack_ix;
441 c->savestack_max = PL_savestack_max; 475 c->savestack_max = PL_savestack_max;
442 c->retstack = PL_retstack; 476 c->retstack = PL_retstack;
443 c->retstack_ix = PL_retstack_ix; 477 c->retstack_ix = PL_retstack_ix;
444 c->retstack_max = PL_retstack_max; 478 c->retstack_max = PL_retstack_max;
479 c->curpm = PL_curpm;
445 c->curcop = PL_curcop; 480 c->curcop = PL_curcop;
446 c->top_env = PL_top_env; 481 c->top_env = PL_top_env;
447} 482}
448 483
449/* 484/*
450 * allocate various perl stacks. This is an exact copy 485 * allocate various perl stacks. This is an exact copy
451 * of perl.c:init_stacks, except that it uses less memory 486 * of perl.c:init_stacks, except that it uses less memory
452 * on the assumption that coroutines do not usually need 487 * on the (sometimes correct) assumption that coroutines do
453 * a lot of stackspace. 488 * not usually need a lot of stackspace.
454 */ 489 */
455STATIC void 490STATIC void
456coro_init_stacks (pTHX) 491coro_init_stacks (pTHX)
457{ 492{
493 LOCK;
494
458 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 495 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
459 PL_curstackinfo->si_type = PERLSI_MAIN; 496 PL_curstackinfo->si_type = PERLSI_MAIN;
460 PL_curstack = PL_curstackinfo->si_stack; 497 PL_curstack = PL_curstackinfo->si_stack;
461 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
462 499
… …
471 508
472 New(54,PL_markstack,16,I32); 509 New(54,PL_markstack,16,I32);
473 PL_markstack_ptr = PL_markstack; 510 PL_markstack_ptr = PL_markstack;
474 PL_markstack_max = PL_markstack + 16; 511 PL_markstack_max = PL_markstack + 16;
475 512
513#ifdef SET_MARK_OFFSET
476 SET_MARK_OFFSET; 514 SET_MARK_OFFSET;
515#endif
477 516
478 New(54,PL_scopestack,16,I32); 517 New(54,PL_scopestack,16,I32);
479 PL_scopestack_ix = 0; 518 PL_scopestack_ix = 0;
480 PL_scopestack_max = 16; 519 PL_scopestack_max = 16;
481 520
… …
484 PL_savestack_max = 96; 523 PL_savestack_max = 96;
485 524
486 New(54,PL_retstack,8,OP*); 525 New(54,PL_retstack,8,OP*);
487 PL_retstack_ix = 0; 526 PL_retstack_ix = 0;
488 PL_retstack_max = 8; 527 PL_retstack_max = 8;
528
529 UNLOCK;
489} 530}
490 531
491/* 532/*
492 * destroy the stacks, the callchain etc... 533 * destroy the stacks, the callchain etc...
493 * still there is a memleak of 128 bytes...
494 */ 534 */
495STATIC void 535STATIC void
496destroy_stacks(pTHX) 536destroy_stacks(pTHX)
497{ 537{
498 if (!IN_DESTRUCT) 538 if (!IN_DESTRUCT)
499 { 539 {
500 /* is this ugly, I ask? */ 540 /* is this ugly, I ask? */
501 while (PL_scopestack_ix) 541 LEAVE_SCOPE (0);
502 LEAVE;
503 542
504 /* sure it is, but more important: is it correct?? :/ */ 543 /* sure it is, but more important: is it correct?? :/ */
505 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
506 FREETMPS; 544 FREETMPS;
545
546 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
507 } 547 }
508 548
509 while (PL_curstackinfo->si_next) 549 while (PL_curstackinfo->si_next)
510 PL_curstackinfo = PL_curstackinfo->si_next; 550 PL_curstackinfo = PL_curstackinfo->si_next;
511 551
512 while (PL_curstackinfo) 552 while (PL_curstackinfo)
513 { 553 {
514 PERL_SI *p = PL_curstackinfo->si_prev; 554 PERL_SI *p = PL_curstackinfo->si_prev;
515 555
516 { 556 { /*D*//*remove*/
517 dSP; 557 dSP;
518 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 558 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
519 PUTBACK; /* possibly superfluous */ 559 PUTBACK; /* possibly superfluous */
520 } 560 }
521 561
522 if (!IN_DESTRUCT) 562 if (!IN_DESTRUCT)
523 { 563 {
524 dounwind(-1); 564 dounwind (-1);/*D*//*remove*/
525 SvREFCNT_dec(PL_curstackinfo->si_stack); 565 SvREFCNT_dec (PL_curstackinfo->si_stack);
526 } 566 }
527 567
528 Safefree(PL_curstackinfo->si_cxstack); 568 Safefree (PL_curstackinfo->si_cxstack);
529 Safefree(PL_curstackinfo); 569 Safefree (PL_curstackinfo);
530 PL_curstackinfo = p; 570 PL_curstackinfo = p;
531 } 571 }
532 572
533 Safefree(PL_tmps_stack); 573 Safefree (PL_tmps_stack);
534 Safefree(PL_markstack); 574 Safefree (PL_markstack);
535 Safefree(PL_scopestack); 575 Safefree (PL_scopestack);
536 Safefree(PL_savestack); 576 Safefree (PL_savestack);
537 Safefree(PL_retstack); 577 Safefree (PL_retstack);
538} 578}
539 579
540static void 580static void
541allocate_stack (Coro__State ctx, int alloc) 581allocate_stack (Coro__State ctx, int alloc)
542{ 582{
… …
545 New (0, stack, 1, coro_stack); 585 New (0, stack, 1, coro_stack);
546 586
547 stack->refcnt = 1; 587 stack->refcnt = 1;
548 stack->usecnt = 1; 588 stack->usecnt = 1;
549 stack->gencnt = ctx->gencnt = 0; 589 stack->gencnt = ctx->gencnt = 0;
590
550 if (alloc) 591 if (alloc)
551 { 592 {
552#if HAVE_MMAP 593#if HAVE_MMAP
553 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 594 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
554 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 595 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
555 if (stack->sptr == (void *)-1) 596 if (stack->sptr == (void *)-1)
556#endif 597#endif
557 { 598 {
558 /*FIXME*//*D*//* reasonable stack size! */ 599 /*FIXME*//*D*//* reasonable stack size! */
559 stack->ssize = -4096 * sizeof (long); 600 stack->ssize = - (8192 * sizeof (long));
560 New (0, stack->sptr, 4096, long); 601 New (0, stack->sptr, 8192, long);
561 } 602 }
562 } 603 }
563 else 604 else
564 stack->sptr = 0; 605 stack->sptr = 0;
565 606
… …
579 { 620 {
580#ifdef HAVE_MMAP 621#ifdef HAVE_MMAP
581 if (stack->ssize > 0 && stack->sptr) 622 if (stack->ssize > 0 && stack->sptr)
582 munmap (stack->sptr, stack->ssize); 623 munmap (stack->sptr, stack->ssize);
583 else 624 else
584#else 625#endif
585 Safefree (stack->sptr); 626 Safefree (stack->sptr);
586#endif 627
587 Safefree (stack); 628 Safefree (stack);
588 } 629 }
589 else if (ctx->gencnt == stack->gencnt) 630 else if (ctx->gencnt == stack->gencnt)
590 --stack->usecnt; 631 --stack->usecnt;
591 } 632 }
… …
595setup_coro (void *arg) 636setup_coro (void *arg)
596{ 637{
597 /* 638 /*
598 * emulate part of the perl startup here. 639 * emulate part of the perl startup here.
599 */ 640 */
641 dTHX;
600 dSP; 642 dSP;
601 Coro__State ctx = (Coro__State)arg; 643 Coro__State ctx = (Coro__State)arg;
602 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 644 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
603 645
604 coro_init_stacks (aTHX); 646 coro_init_stacks (aTHX);
605 /*PL_curcop = 0;*/ 647 /*PL_curcop = 0;*/
606 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 648 /*PL_in_eval = PL_in_eval;*/ /* inherit */
607 SvREFCNT_dec (GvAV (PL_defgv)); 649 SvREFCNT_dec (GvAV (PL_defgv));
608 GvAV (PL_defgv) = ctx->args; 650 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
609 651
610 SPAGAIN; 652 SPAGAIN;
611 653
612 if (ctx->stack) 654 if (ctx->stack)
613 { 655 {
… …
653continue_coro (void *arg) 695continue_coro (void *arg)
654{ 696{
655 /* 697 /*
656 * this is a _very_ stripped down perl interpreter ;) 698 * this is a _very_ stripped down perl interpreter ;)
657 */ 699 */
700 dTHX;
658 Coro__State ctx = (Coro__State)arg; 701 Coro__State ctx = (Coro__State)arg;
659 JMPENV coro_start_env; 702 JMPENV coro_start_env;
660 703
661 /* same as JMPENV_BOOTSTRAP */
662 Zero(&coro_start_env, 1, JMPENV);
663 coro_start_env.je_ret = -1;
664 coro_start_env.je_mustcatch = TRUE;
665 PL_top_env = &coro_start_env; 704 PL_top_env = &ctx->start_env;
666 705
667 ctx->cursp = 0; 706 ctx->cursp = 0;
668 PL_op = PL_op->op_next; 707 PL_op = PL_op->op_next;
669 CALLRUNOPS(aTHX); 708 CALLRUNOPS(aTHX);
670 709
671 abort (); 710 abort ();
672} 711}
673 712
674STATIC void 713STATIC void
675transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 714transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
676{ 715{
677 dSTACKLEVEL; 716 dSTACKLEVEL;
678 static struct coro *xnext;
679 717
680 if (prev != next) 718 if (prev != next)
681 { 719 {
682 xnext = next;
683
684 if (next->mainstack) 720 if (next->mainstack)
685 { 721 {
722 LOCK;
686 SAVE (prev, flags); 723 SAVE (prev, flags);
687 LOAD (next); 724 LOAD (next);
725 UNLOCK;
688 726
689 /* mark this state as in-use */ 727 /* mark this state as in-use */
690 next->mainstack = 0; 728 next->mainstack = 0;
691 next->tmps_ix = -2; 729 next->tmps_ix = -2;
692 730
… …
711 continue_coro, (void *)next, 749 continue_coro, (void *)next,
712 next->stack->sptr, labs (next->stack->ssize)); 750 next->stack->sptr, labs (next->stack->ssize));
713 } 751 }
714 752
715 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 753 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
754 prev->cursp = stacklevel;
716 /* don't add any code here */ 755 /* don't add any code here */
717 } 756 }
718 757 else
758 next->cursp = stacklevel;
719 } 759 }
720 else if (next->tmps_ix == -2) 760 else if (next->tmps_ix == -2)
721 croak ("tried to transfer to running coroutine"); 761 croak ("tried to transfer to running coroutine");
722 else 762 else
723 { 763 {
764 LOCK;
724 SAVE (prev, -1); /* first get rid of the old state */ 765 SAVE (prev, -1); /* first get rid of the old state */
766 UNLOCK;
725 767
726 if (flags & TRANSFER_SAVE_CCTXT) 768 if (flags & TRANSFER_SAVE_CCTXT)
727 { 769 {
728 if (!prev->stack) 770 if (!prev->stack)
729 allocate_stack (prev, 0); 771 allocate_stack (prev, 0);
730 772
731 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 773 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
732 { 774 {
775 PL_top_env = &next->start_env;
776
733 setup_coro (next); 777 setup_coro (next);
778 next->cursp = stacklevel;
734 779
735 prev->stack->refcnt++; 780 prev->stack->refcnt++;
736 prev->stack->usecnt++; 781 prev->stack->usecnt++;
737 next->stack = prev->stack; 782 next->stack = prev->stack;
738 next->gencnt = prev->gencnt; 783 next->gencnt = prev->gencnt;
739 } 784 }
740 else 785 else
741 { 786 {
787 assert (!next->stack);
742 allocate_stack (next, 1); 788 allocate_stack (next, 1);
743 coro_create (&(next->stack->cctx), 789 coro_create (&(next->stack->cctx),
744 setup_coro, (void *)next, 790 setup_coro, (void *)next,
745 next->stack->sptr, labs (next->stack->ssize)); 791 next->stack->sptr, labs (next->stack->ssize));
746 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 792 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
793 prev->cursp = stacklevel;
747 /* don't add any code here */ 794 /* don't add any code here */
748 } 795 }
749 } 796 }
750 else 797 else
798 {
751 setup_coro (next); 799 setup_coro (next);
800 next->cursp = stacklevel;
801 }
752 } 802 }
753
754 /*
755 * xnext is now either prev or next, depending on wether
756 * we switched the c stack or not. that's why I use a global
757 * variable, that should become thread-specific at one point.
758 */
759 xnext->cursp = stacklevel;
760 } 803 }
761 804
805 LOCK;
762 if (coro_mortal) 806 if (coro_mortal)
763 { 807 {
764 SvREFCNT_dec (coro_mortal); 808 SvREFCNT_dec (coro_mortal);
765 coro_mortal = 0; 809 coro_mortal = 0;
766 } 810 }
811 UNLOCK;
767} 812}
768 813
769#define SV_CORO(sv,func) \ 814#define SV_CORO(sv,func) \
770 do { \ 815 do { \
771 if (SvROK (sv)) \ 816 if (SvROK (sv)) \
772 sv = SvRV (sv); \ 817 sv = SvRV (sv); \
773 \ 818 \
774 if (SvTYPE(sv) == SVt_PVHV) \ 819 if (SvTYPE (sv) == SVt_PVHV) \
775 { \ 820 { \
776 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 821 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
777 \ 822 \
778 if (!he) \ 823 if (!he) \
779 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 824 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
780 \ 825 \
781 (sv) = SvRV (HeVAL(he)); \ 826 (sv) = SvRV (HeVAL(he)); \
782 } \ 827 } \
783 \ 828 \
784 /* must also be changed inside Coro::Cont::yield */ \ 829 /* must also be changed inside Coro::Cont::yield */ \
785 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 830 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
786 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 831 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
787 \ 832 \
788 } while(0) 833 } while(0)
789 834
790#define SvSTATE(sv) (struct coro *)SvIV (sv) 835#define SvSTATE(sv) (struct coro *)SvIV (sv)
… …
793api_transfer(pTHX_ SV *prev, SV *next, int flags) 838api_transfer(pTHX_ SV *prev, SV *next, int flags)
794{ 839{
795 SV_CORO (prev, "Coro::transfer"); 840 SV_CORO (prev, "Coro::transfer");
796 SV_CORO (next, "Coro::transfer"); 841 SV_CORO (next, "Coro::transfer");
797 842
798 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 843 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
799} 844}
800 845
801/** Coro ********************************************************************/ 846/** Coro ********************************************************************/
802 847
803#define PRIO_MAX 3 848#define PRIO_MAX 3
… …
811static GV *coro_current, *coro_idle; 856static GV *coro_current, *coro_idle;
812static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 857static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
813static int coro_nready; 858static int coro_nready;
814 859
815static void 860static void
816coro_enq (SV *sv) 861coro_enq (pTHX_ SV *sv)
817{ 862{
818 if (SvTYPE (sv) == SVt_PVHV) 863 if (SvTYPE (sv) == SVt_PVHV)
819 { 864 {
820 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 865 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
821 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 866 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
… …
832 877
833 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 878 croak ("Coro::ready tried to enqueue something that is not a coroutine");
834} 879}
835 880
836static SV * 881static SV *
837coro_deq (int min_prio) 882coro_deq (pTHX_ int min_prio)
838{ 883{
839 int prio = PRIO_MAX - PRIO_MIN; 884 int prio = PRIO_MAX - PRIO_MIN;
840 885
841 min_prio -= PRIO_MIN; 886 min_prio -= PRIO_MIN;
842 if (min_prio < 0) 887 if (min_prio < 0)
… …
853} 898}
854 899
855static void 900static void
856api_ready (SV *coro) 901api_ready (SV *coro)
857{ 902{
903 dTHX;
904
858 if (SvROK (coro)) 905 if (SvROK (coro))
859 coro = SvRV (coro); 906 coro = SvRV (coro);
860 907
908 LOCK;
861 coro_enq (SvREFCNT_inc (coro)); 909 coro_enq (aTHX_ SvREFCNT_inc (coro));
910 UNLOCK;
862} 911}
863 912
864static void 913static void
865api_schedule (void) 914api_schedule (void)
866{ 915{
916 dTHX;
917
867 SV *prev, *next; 918 SV *prev, *next;
868 919
920 LOCK;
921
869 prev = SvRV (GvSV (coro_current)); 922 prev = SvRV (GvSV (coro_current));
870 next = coro_deq (PRIO_MIN); 923 next = coro_deq (aTHX_ PRIO_MIN);
871 924
872 if (!next) 925 if (!next)
873 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 926 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
874 927
875 /* free this only after the transfer */ 928 /* free this only after the transfer */
… …
878 931
879 SvRV (GvSV (coro_current)) = next; 932 SvRV (GvSV (coro_current)) = next;
880 933
881 SV_CORO (next, "Coro::schedule"); 934 SV_CORO (next, "Coro::schedule");
882 935
936 UNLOCK;
937
883 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 938 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
884 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 939 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
885} 940}
886 941
887static void 942static void
888api_cede (void) 943api_cede (void)
889{ 944{
945 dTHX;
946
947 LOCK;
890 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 948 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
949 UNLOCK;
891 950
892 api_schedule (); 951 api_schedule ();
893} 952}
894 953
895MODULE = Coro::State PACKAGE = Coro::State 954MODULE = Coro::State PACKAGE = Coro::State
896 955
897PROTOTYPES: ENABLE 956PROTOTYPES: ENABLE
898 957
899BOOT: 958BOOT:
900{ /* {} necessary for stoopid perl-5.6.x */ 959{ /* {} necessary for stoopid perl-5.6.x */
960#ifdef USE_ITHREADS
961 MUTEX_INIT (&coro_mutex);
962#endif
963
901 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 964 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
902 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 965 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
903 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 966 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
904 967
905 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 968 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
906 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 969 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
907 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 970 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 971 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909
910 if (!padlist_cache)
911 padlist_cache = newHV ();
912 972
913 main_mainstack = PL_mainstack; 973 main_mainstack = PL_mainstack;
914 974
915 coroapi.ver = CORO_API_VERSION; 975 coroapi.ver = CORO_API_VERSION;
916 coroapi.transfer = api_transfer; 976 coroapi.transfer = api_transfer;
… …
924 Coro__State coro; 984 Coro__State coro;
925 985
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 986 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 987 croak ("Coro::State::_newprocess expects an arrayref");
928 988
929 New (0, coro, 1, struct coro); 989 Newz (0, coro, 1, struct coro);
930 990
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 991 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 992 /*coro->mainstack = 0; *//*actual work is done inside transfer */
933 coro->stack = 0; 993 /*coro->stack = 0;*/
994
995 /* same as JMPENV_BOOTSTRAP */
996 /* we might be able to recycle start_env, but safe is safe */
997 /*Zero(&coro->start_env, 1, JMPENV);*/
998 coro->start_env.je_ret = -1;
999 coro->start_env.je_mustcatch = TRUE;
934 1000
935 RETVAL = coro; 1001 RETVAL = coro;
936 OUTPUT: 1002 OUTPUT:
937 RETVAL 1003 RETVAL
938 1004
… …
957 if (coro->mainstack && coro->mainstack != main_mainstack) 1023 if (coro->mainstack && coro->mainstack != main_mainstack)
958 { 1024 {
959 struct coro temp; 1025 struct coro temp;
960 1026
961 PUTBACK; 1027 PUTBACK;
962 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1028 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
963 LOAD(aTHX_ coro); 1029 LOAD (aTHX_ coro);
964 SPAGAIN; 1030 SPAGAIN;
965 1031
966 destroy_stacks (aTHX); 1032 destroy_stacks (aTHX);
967 1033
968 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1034 LOAD ((&temp)); /* this will get rid of defsv etc.. */
969 SPAGAIN; 1035 SPAGAIN;
970 1036
971 coro->mainstack = 0; 1037 coro->mainstack = 0;
972 } 1038 }
973 1039
974 deallocate_stack (coro); 1040 deallocate_stack (coro);
975 1041 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1042 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1043
985void 1044void
986_exit(code) 1045_exit(code)
987 int code 1046 int code
988 PROTOTYPE: $ 1047 PROTOTYPE: $
989 CODE: 1048 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1049 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1050
998MODULE = Coro::State PACKAGE = Coro::Cont 1051MODULE = Coro::State PACKAGE = Coro::Cont
999 1052
1000# this is slightly dirty (should expose a c-level api) 1053# this is slightly dirty (should expose a c-level api)
1001 1054
1002void 1055void
1003yield(...) 1056yield(...)
1004 PROTOTYPE: @ 1057 PROTOTYPE: @
1005 CODE: 1058 CODE:
1006 static SV *returnstk; 1059 SV *yieldstack;
1007 SV *sv; 1060 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1061 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1062 struct coro *prev, *next;
1010 1063
1011 if (!returnstk) 1064 yieldstack = *hv_fetch (
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1065 (HV *)SvRV (GvSV (coro_current)),
1066 "yieldstack", sizeof ("yieldstack") - 1,
1067 0
1068 );
1013 1069
1014 /* set up @_ -- ugly */ 1070 /* set up @_ -- ugly */
1015 av_clear (defav); 1071 av_clear (defav);
1016 av_fill (defav, items - 1); 1072 av_fill (defav, items - 1);
1017 while (items--) 1073 while (items--)
1018 av_store (defav, items, SvREFCNT_inc (ST(items))); 1074 av_store (defav, items, SvREFCNT_inc (ST(items)));
1019 1075
1020 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1021 sv = av_pop ((AV *)SvRV (returnstk)); 1076 sv = av_pop ((AV *)SvRV (yieldstack));
1022 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1077 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1023 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1078 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1024 SvREFCNT_dec (sv); 1079 SvREFCNT_dec (sv);
1025 1080
1026 transfer(aTHX_ prev, next, 0); 1081 transfer (aTHX_ prev, next, 0);
1027 1082
1028MODULE = Coro::State PACKAGE = Coro 1083MODULE = Coro::State PACKAGE = Coro
1029 1084
1030# this is slightly dirty (should expose a c-level api) 1085# this is slightly dirty (should expose a c-level api)
1031 1086
… …
1060 sv_setiv(sv, (IV)&coroapi); 1115 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1116 SvREADONLY_on(sv);
1062 } 1117 }
1063} 1118}
1064 1119
1120#if !PERL_MICRO
1121
1065void 1122void
1066ready(self) 1123ready(self)
1067 SV * self 1124 SV * self
1068 PROTOTYPE: $ 1125 PROTOTYPE: $
1069 CODE: 1126 CODE:
1070 api_ready (self); 1127 api_ready (self);
1128
1129#endif
1071 1130
1072int 1131int
1073nready(...) 1132nready(...)
1074 PROTOTYPE: 1133 PROTOTYPE:
1075 CODE: 1134 CODE:

Diff Legend

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