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.116 by root, Fri Dec 1 14:01:43 2006 UTC vs.
Revision 1.131 by root, Fri Dec 29 11:37:49 2006 UTC

4#include "perl.h" 4#include "perl.h"
5#include "XSUB.h" 5#include "XSUB.h"
6 6
7#include "patchlevel.h" 7#include "patchlevel.h"
8 8
9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13/* the maximum number of idle cctx that will be pooled */
14#define MAX_IDLE_CCTX 8
15
16#define PERL_VERSION_ATLEAST(a,b,c) \
17 (PERL_REVISION > (a) \
18 || (PERL_REVISION == (a) \
19 && (PERL_VERSION > (b) \
20 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
21
22#if !PERL_VERSION_ATLEAST (5,6,0)
23# ifndef PL_ppaddr
24# define PL_ppaddr ppaddr
25# endif
26# ifndef call_sv
27# define call_sv perl_call_sv
28# endif
29# ifndef get_sv
30# define get_sv perl_get_sv
31# endif
32# ifndef get_cv
33# define get_cv perl_get_cv
34# endif
35# ifndef IS_PADGV
36# define IS_PADGV(v) 0
37# endif
38# ifndef IS_PADCONST
39# define IS_PADCONST(v) 0
40# endif
41#endif
42
43#include <stdio.h> 9#include <stdio.h>
44#include <errno.h> 10#include <errno.h>
45 11#include <assert.h>
46#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
47# undef STACKGUARD
48#endif
49
50#ifndef STACKGUARD
51# define STACKGUARD 0
52#endif
53 12
54#ifdef HAVE_MMAP 13#ifdef HAVE_MMAP
55# include <unistd.h> 14# include <unistd.h>
56# include <sys/mman.h> 15# include <sys/mman.h>
57# ifndef MAP_ANONYMOUS 16# ifndef MAP_ANONYMOUS
72#else 31#else
73# define PAGESIZE 0 32# define PAGESIZE 0
74# define BOOT_PAGESIZE (void)0 33# define BOOT_PAGESIZE (void)0
75#endif 34#endif
76 35
36#if USE_VALGRIND
37# include <valgrind/valgrind.h>
38#endif
39
40/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8
42
43#define PERL_VERSION_ATLEAST(a,b,c) \
44 (PERL_REVISION > (a) \
45 || (PERL_REVISION == (a) \
46 && (PERL_VERSION > (b) \
47 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
48
49#if !PERL_VERSION_ATLEAST (5,6,0)
50# ifndef PL_ppaddr
51# define PL_ppaddr ppaddr
52# endif
53# ifndef call_sv
54# define call_sv perl_call_sv
55# endif
56# ifndef get_sv
57# define get_sv perl_get_sv
58# endif
59# ifndef get_cv
60# define get_cv perl_get_cv
61# endif
62# ifndef IS_PADGV
63# define IS_PADGV(v) 0
64# endif
65# ifndef IS_PADCONST
66# define IS_PADCONST(v) 0
67# endif
68#endif
69
70/* 5.8.7 */
71#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v)
73#endif
74
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD
77#endif
78
79#ifndef STACKGUARD
80# define STACKGUARD 0
81#endif
82
83/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0
86#endif
87
77/* The next macro should declare a variable stacklevel that contains and approximation 88/* The next macro should declare a variable stacklevel that contains and approximation
78 * to the current C stack pointer. Its property is that it changes with each call 89 * to the current C stack pointer. Its property is that it changes with each call
79 * and should be unique. */ 90 * and should be unique. */
80#define dSTACKLEVEL int stacklevel 91#define dSTACKLEVEL int stacklevel
81#define STACKLEVEL ((void *)&stacklevel) 92#define STACKLEVEL ((void *)&stacklevel)
82 93
83#define IN_DESTRUCT (PL_main_cv == Nullcv) 94#define IN_DESTRUCT (PL_main_cv == Nullcv)
84 95
85#if __GNUC__ >= 3 96#if __GNUC__ >= 3
86# define attribute(x) __attribute__(x) 97# define attribute(x) __attribute__(x)
98# define BARRIER __asm__ __volatile__ ("" : : : "memory")
87#else 99#else
88# define attribute(x) 100# define attribute(x)
101# define BARRIER
89#endif 102#endif
90 103
91#define NOINLINE attribute ((noinline)) 104#define NOINLINE attribute ((noinline))
92 105
93#include "CoroAPI.h" 106#include "CoroAPI.h"
94
95#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
96 107
97#ifdef USE_ITHREADS 108#ifdef USE_ITHREADS
98static perl_mutex coro_mutex; 109static perl_mutex coro_mutex;
99# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 110# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
100# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 111# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
101#else 112#else
102# define LOCK (void)0 113# define LOCK (void)0
103# define UNLOCK (void)0 114# define UNLOCK (void)0
104#endif 115#endif
105 116
117struct io_state
118{
119 int errorno;
120 I32 laststype;
121 int laststatval;
122 Stat_t statcache;
123};
124
106static struct CoroAPI coroapi; 125static struct CoroAPI coroapi;
107static AV *main_mainstack; /* used to differentiate between $main and others */ 126static AV *main_mainstack; /* used to differentiate between $main and others */
108static HV *coro_state_stash, *coro_stash; 127static HV *coro_state_stash, *coro_stash;
109static SV *coro_mortal; /* will be freed after next transfer */ 128static SV *coro_mortal; /* will be freed after next transfer */
110 129
130 int valgrind_id; 149 int valgrind_id;
131#endif 150#endif
132} coro_cctx; 151} coro_cctx;
133 152
134enum { 153enum {
135 CF_RUNNING, /* coroutine is running */ 154 CF_RUNNING = 0x0001, /* coroutine is running */
136 CF_READY, /* coroutine is ready */ 155 CF_READY = 0x0002, /* coroutine is ready */
156 CF_NEW = 0x0004, /* ahs never been switched to */
137}; 157};
138 158
139/* this is a structure representing a perl-level coroutine */ 159/* this is a structure representing a perl-level coroutine */
140struct coro { 160struct coro {
141 /* the c coroutine allocated to this perl coroutine, if any */ 161 /* the c coroutine allocated to this perl coroutine, if any */
142 coro_cctx *cctx; 162 coro_cctx *cctx;
143 163
144 /* data associated with this coroutine (initial args) */ 164 /* data associated with this coroutine (initial args) */
145 AV *args; 165 AV *args;
146 int refcnt; 166 int refcnt;
147 int flags; 167 int save; /* CORO_SAVE flags */
168 int flags; /* CF_ flags */
148 169
149 /* optionally saved, might be zero */ 170 /* optionally saved, might be zero */
150 AV *defav; 171 AV *defav; /* @_ */
151 SV *defsv; 172 SV *defsv; /* $_ */
152 SV *errsv; 173 SV *errsv; /* $@ */
174 SV *irssv; /* $/ */
175 SV *irssv_sv; /* real $/ cache */
153 176
154#define VAR(name,type) type name; 177#define VAR(name,type) type name;
155# include "state.h" 178# include "state.h"
156#undef VAR 179#undef VAR
157 180
243 266
244 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 267 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
245 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 268 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
246 else 269 else
247 { 270 {
248#if 0 271#if PREFER_PERL_FUNCTIONS
249 /* this is probably cleaner, but also slower? */ 272 /* this is probably cleaner, but also slower? */
250 CV *cp = Perl_cv_clone (cv); 273 CV *cp = Perl_cv_clone (cv);
251 CvPADLIST (cv) = CvPADLIST (cp); 274 CvPADLIST (cv) = CvPADLIST (cp);
252 CvPADLIST (cp) = 0; 275 CvPADLIST (cp) = 0;
253 SvREFCNT_dec (cp); 276 SvREFCNT_dec (cp);
280} 303}
281 304
282#define SB do { 305#define SB do {
283#define SE } while (0) 306#define SE } while (0)
284 307
285#define LOAD(state) load_state((state));
286#define SAVE(state,flags) save_state((state),(flags));
287
288#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 308#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
289 309
290static void 310static void
291load_state(Coro__State c) 311load_perl (Coro__State c)
292{ 312{
293#define VAR(name,type) PL_ ## name = c->name; 313#define VAR(name,type) PL_ ## name = c->name;
294# include "state.h" 314# include "state.h"
295#undef VAR 315#undef VAR
296 316
297 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 317 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
298 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 318 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
299 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 319 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
320 if (c->irssv)
321 {
322 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
323 SvREFCNT_dec (c->irssv);
324 else
325 {
326 REPLACE_SV (PL_rs, c->irssv);
327 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
328 sv_setsv (c->irssv_sv, PL_rs);
329 }
330 }
300 331
301 { 332 {
302 dSP; 333 dSP;
303 CV *cv; 334 CV *cv;
304 335
313 PUTBACK; 344 PUTBACK;
314 } 345 }
315} 346}
316 347
317static void 348static void
318save_state(Coro__State c, int flags) 349save_perl (Coro__State c)
319{ 350{
320 { 351 {
321 dSP; 352 dSP;
322 I32 cxix = cxstack_ix; 353 I32 cxix = cxstack_ix;
323 PERL_CONTEXT *ccstk = cxstack; 354 PERL_CONTEXT *ccstk = cxstack;
326 /* 357 /*
327 * the worst thing you can imagine happens first - we have to save 358 * the worst thing you can imagine happens first - we have to save
328 * (and reinitialize) all cv's in the whole callchain :( 359 * (and reinitialize) all cv's in the whole callchain :(
329 */ 360 */
330 361
362 EXTEND (SP, 3 + 1);
331 PUSHs (Nullsv); 363 PUSHs (Nullsv);
332 /* this loop was inspired by pp_caller */ 364 /* this loop was inspired by pp_caller */
333 for (;;) 365 for (;;)
334 { 366 {
335 while (cxix >= 0) 367 while (cxix >= 0)
336 { 368 {
337 PERL_CONTEXT *cx = &ccstk[cxix--]; 369 PERL_CONTEXT *cx = &ccstk[cxix--];
338 370
339 if (CxTYPE(cx) == CXt_SUB) 371 if (CxTYPE (cx) == CXt_SUB)
340 { 372 {
341 CV *cv = cx->blk_sub.cv; 373 CV *cv = cx->blk_sub.cv;
342 374
343 if (CvDEPTH (cv)) 375 if (CvDEPTH (cv))
344 { 376 {
345 EXTEND (SP, 3); 377 EXTEND (SP, 3);
346
347 PUSHs ((SV *)CvPADLIST(cv)); 378 PUSHs ((SV *)CvPADLIST (cv));
348 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 379 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
349 PUSHs ((SV *)cv); 380 PUSHs ((SV *)cv);
350 381
351 CvDEPTH (cv) = 0; 382 CvDEPTH (cv) = 0;
352 get_padlist (cv); 383 get_padlist (cv);
353 } 384 }
354 } 385 }
355#ifdef CXt_FORMAT
356 else if (CxTYPE(cx) == CXt_FORMAT)
357 {
358 /* I never used formats, so how should I know how these are implemented? */
359 /* my bold guess is as a simple, plain sub... */
360 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
361 }
362#endif
363 } 386 }
364 387
365 if (top_si->si_type == PERLSI_MAIN) 388 if (top_si->si_type == PERLSI_MAIN)
366 break; 389 break;
367 390
371 } 394 }
372 395
373 PUTBACK; 396 PUTBACK;
374 } 397 }
375 398
376 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 399 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0;
377 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 400 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0;
378 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 401 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0;
402 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0;
379 403
380#define VAR(name,type)c->name = PL_ ## name; 404#define VAR(name,type)c->name = PL_ ## name;
381# include "state.h" 405# include "state.h"
382#undef VAR 406#undef VAR
383} 407}
386 * allocate various perl stacks. This is an exact copy 410 * allocate various perl stacks. This is an exact copy
387 * of perl.c:init_stacks, except that it uses less memory 411 * of perl.c:init_stacks, except that it uses less memory
388 * on the (sometimes correct) assumption that coroutines do 412 * on the (sometimes correct) assumption that coroutines do
389 * not usually need a lot of stackspace. 413 * not usually need a lot of stackspace.
390 */ 414 */
415#if PREFER_PERL_FUNCTIONS
416# define coro_init_stacks init_stacks
417#else
391static void 418static void
392coro_init_stacks () 419coro_init_stacks ()
393{ 420{
394 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 421 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
395 PL_curstackinfo->si_type = PERLSI_MAIN; 422 PL_curstackinfo->si_type = PERLSI_MAIN;
425 New(54,PL_retstack,16,OP*); 452 New(54,PL_retstack,16,OP*);
426 PL_retstack_ix = 0; 453 PL_retstack_ix = 0;
427 PL_retstack_max = 16; 454 PL_retstack_max = 16;
428#endif 455#endif
429} 456}
457#endif
430 458
431/* 459/*
432 * destroy the stacks, the callchain etc... 460 * destroy the stacks, the callchain etc...
433 */ 461 */
434static void 462static void
435coro_destroy_stacks () 463coro_destroy_stacks ()
436{ 464{
437 if (!IN_DESTRUCT) 465 if (!IN_DESTRUCT)
438 { 466 {
439 /* is this ugly, I ask? */ 467 /* restore all saved variables and stuff */
440 LEAVE_SCOPE (0); 468 LEAVE_SCOPE (0);
469 assert (PL_tmps_floor == -1);
441 470
442 /* sure it is, but more important: is it correct?? :/ */ 471 /* free all temporaries */
443 FREETMPS; 472 FREETMPS;
473 assert (PL_tmps_ix == -1);
444 474
445 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 475 POPSTACK_TO (PL_mainstack);
446 } 476 }
447 477
448 while (PL_curstackinfo->si_next) 478 while (PL_curstackinfo->si_next)
449 PL_curstackinfo = PL_curstackinfo->si_next; 479 PL_curstackinfo = PL_curstackinfo->si_next;
450 480
451 while (PL_curstackinfo) 481 while (PL_curstackinfo)
452 { 482 {
453 PERL_SI *p = PL_curstackinfo->si_prev; 483 PERL_SI *p = PL_curstackinfo->si_prev;
454 484
455 { /*D*//*remove*/
456 dSP;
457 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
458 PUTBACK; /* possibly superfluous */
459 }
460
461 if (!IN_DESTRUCT) 485 if (!IN_DESTRUCT)
462 {
463 dounwind (-1);/*D*//*remove*/
464 SvREFCNT_dec (PL_curstackinfo->si_stack); 486 SvREFCNT_dec (PL_curstackinfo->si_stack);
465 }
466 487
467 Safefree (PL_curstackinfo->si_cxstack); 488 Safefree (PL_curstackinfo->si_cxstack);
468 Safefree (PL_curstackinfo); 489 Safefree (PL_curstackinfo);
469 PL_curstackinfo = p; 490 PL_curstackinfo = p;
470 } 491 }
485 * emulate part of the perl startup here. 506 * emulate part of the perl startup here.
486 */ 507 */
487 508
488 coro_init_stacks (); 509 coro_init_stacks ();
489 510
490 PL_curcop = 0; 511 PL_curcop = &PL_compiling;
491 PL_in_eval = 0; 512 PL_in_eval = EVAL_NULL;
492 PL_curpm = 0; 513 PL_curpm = 0;
514 PL_localizing = 0;
515 PL_dirty = 0;
516 PL_restartop = 0;
493 517
494 { 518 {
495 dSP; 519 dSP;
496 LOGOP myop; 520 LOGOP myop;
497 521
498 /* I have no idea why this is needed, but it is */
499 PUSHMARK (SP);
500
501 SvREFCNT_dec (GvAV (PL_defgv)); 522 SvREFCNT_dec (GvAV (PL_defgv));
502 GvAV (PL_defgv) = coro->args; coro->args = 0; 523 GvAV (PL_defgv) = coro->args; coro->args = 0;
503 524
504 Zero (&myop, 1, LOGOP); 525 Zero (&myop, 1, LOGOP);
505 myop.op_next = Nullop; 526 myop.op_next = Nullop;
506 myop.op_flags = OPf_WANT_VOID; 527 myop.op_flags = OPf_WANT_VOID;
507 528
508 PL_op = (OP *)&myop;
509
510 PUSHMARK (SP); 529 PUSHMARK (SP);
511 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 530 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE));
512 PUTBACK; 531 PUTBACK;
532 PL_op = (OP *)&myop;
513 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 533 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
514 SPAGAIN; 534 SPAGAIN;
515
516 ENTER; /* necessary e.g. for dounwind */
517 } 535 }
536
537 ENTER; /* necessary e.g. for dounwind */
518} 538}
519 539
520static void 540static void
521free_coro_mortal () 541free_coro_mortal ()
522{ 542{
525 SvREFCNT_dec (coro_mortal); 545 SvREFCNT_dec (coro_mortal);
526 coro_mortal = 0; 546 coro_mortal = 0;
527 } 547 }
528} 548}
529 549
550/* inject a fake call to Coro::State::_cctx_init into the execution */
530static void NOINLINE 551static void NOINLINE
531prepare_cctx (coro_cctx *cctx) 552prepare_cctx (coro_cctx *cctx)
532{ 553{
533 dSP; 554 dSP;
534 LOGOP myop; 555 LOGOP myop;
535 556
536 Zero (&myop, 1, LOGOP); 557 Zero (&myop, 1, LOGOP);
537 myop.op_next = PL_op; 558 myop.op_next = PL_op;
538 myop.op_flags = OPf_WANT_VOID; 559 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
539
540 sv_setiv (get_sv ("Coro::State::_cctx", FALSE), PTR2IV (cctx));
541 560
542 PUSHMARK (SP); 561 PUSHMARK (SP);
562 EXTEND (SP, 2);
563 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
543 XPUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 564 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
544 PUTBACK; 565 PUTBACK;
566 PL_op = (OP *)&myop;
545 PL_restartop = PL_ppaddr[OP_ENTERSUB](aTHX); 567 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
546 SPAGAIN; 568 SPAGAIN;
547} 569}
548 570
549static void 571static void
550coro_run (void *arg) 572coro_run (void *arg)
551{ 573{
552 /* coro_run is the alternative epilogue of transfer() */ 574 /* coro_run is the alternative tail of transfer(), so unlock here. */
553 UNLOCK; 575 UNLOCK;
554 576
555 /* 577 /*
556 * this is a _very_ stripped down perl interpreter ;) 578 * this is a _very_ stripped down perl interpreter ;)
557 */ 579 */
559 581
560 /* inject call to cctx_init */ 582 /* inject call to cctx_init */
561 prepare_cctx ((coro_cctx *)arg); 583 prepare_cctx ((coro_cctx *)arg);
562 584
563 /* somebody will hit me for both perl_run and PL_restartop */ 585 /* somebody will hit me for both perl_run and PL_restartop */
586 PL_restartop = PL_op;
564 perl_run (PL_curinterp); 587 perl_run (PL_curinterp);
565 588
566 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 589 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr);
567 abort (); 590 abort ();
568} 591}
572{ 595{
573 coro_cctx *cctx; 596 coro_cctx *cctx;
574 597
575 ++cctx_count; 598 ++cctx_count;
576 599
577 New (0, cctx, 1, coro_cctx); 600 Newz (0, cctx, 1, coro_cctx);
578 601
579#if HAVE_MMAP 602#if HAVE_MMAP
580 603
581 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 604 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE;
582 /* mmap suppsedly does allocate-on-write for us */ 605 /* mmap supposedly does allocate-on-write for us */
583 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 606 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
584 607
585 if (cctx->sptr == (void *)-1) 608 if (cctx->sptr == (void *)-1)
586 { 609 {
587 perror ("FATAL: unable to mmap stack for coroutine"); 610 perror ("FATAL: unable to mmap stack for coroutine");
677 cctx_first = cctx; 700 cctx_first = cctx;
678} 701}
679 702
680/* never call directly, always through the coro_state_transfer global variable */ 703/* never call directly, always through the coro_state_transfer global variable */
681static void NOINLINE 704static void NOINLINE
682transfer (struct coro *prev, struct coro *next, int flags) 705transfer (struct coro *prev, struct coro *next)
683{ 706{
684 dSTACKLEVEL; 707 dSTACKLEVEL;
685 708
686 /* sometimes transfer is only called to set idle_sp */ 709 /* sometimes transfer is only called to set idle_sp */
687 if (flags == TRANSFER_SET_STACKLEVEL) 710 if (!next)
711 {
688 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 712 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
713 assert (((coro_cctx *)prev)->top_env = PL_top_env); /* just for the side effetc when assert is enabled */
714 }
689 else if (prev != next) 715 else if (prev != next)
690 { 716 {
691 coro_cctx *prev__cctx; 717 coro_cctx *prev__cctx;
692 718
693 if (!prev->cctx) 719 if (prev->flags & CF_NEW)
694 { 720 {
695 /* create a new empty context */ 721 /* create a new empty context */
696 Newz (0, prev->cctx, 1, coro_cctx); 722 Newz (0, prev->cctx, 1, coro_cctx);
697 prev->cctx->inuse = 1; 723 prev->cctx->inuse = 1;
724 prev->flags &= ~CF_NEW;
698 prev->flags |= CF_RUNNING; 725 prev->flags |= CF_RUNNING;
699 } 726 }
700 727
728 /*TODO: must not croak here */
701 if (!prev->flags & CF_RUNNING) 729 if (!prev->flags & CF_RUNNING)
702 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 730 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
703 731
704 if (next->flags & CF_RUNNING) 732 if (next->flags & CF_RUNNING)
705 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 733 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
707 prev->flags &= ~CF_RUNNING; 735 prev->flags &= ~CF_RUNNING;
708 next->flags |= CF_RUNNING; 736 next->flags |= CF_RUNNING;
709 737
710 LOCK; 738 LOCK;
711 739
712 if (next->mainstack) 740 if (next->flags & CF_NEW)
713 { 741 {
714 /* coroutine already started */ 742 /* need to start coroutine */
715 SAVE (prev, flags); 743 next->flags &= ~CF_NEW;
716 LOAD (next); 744 /* first get rid of the old state */
745 save_perl (prev);
746 /* setup coroutine call */
747 setup_coro (next);
748 /* need a new stack */
749 assert (!next->cctx);
717 } 750 }
718 else 751 else
719 { 752 {
720 /* need to start coroutine */ 753 /* coroutine already started */
721 /* first get rid of the old state */ 754 save_perl (prev);
722 SAVE (prev, -1); 755 load_perl (next);
723 /* setup coroutine call */
724 setup_coro (next);
725 /* need a new stack */
726 assert (!next->stack);
727 } 756 }
728 757
729 prev__cctx = prev->cctx; 758 prev__cctx = prev->cctx;
730 759
731 /* possibly "free" the cctx */ 760 /* possibly "free" the cctx */
732 if (prev__cctx->idle_sp == STACKLEVEL) 761 if (prev__cctx->idle_sp == STACKLEVEL)
733 { 762 {
734 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 763 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
735 assert (PL_top_env == prev__cctx->top_env); 764 assert (PL_top_env == prev__cctx->top_env);
736 765
766 prev->cctx = 0;
767
737 cctx_put (prev__cctx); 768 cctx_put (prev__cctx);
738 prev->cctx = 0; 769 prev__cctx->inuse = 0;
739 } 770 }
740 771
741 if (!next->cctx) 772 if (!next->cctx)
773 {
742 next->cctx = cctx_get (); 774 next->cctx = cctx_get ();
775 assert (!next->cctx->inuse);
776 next->cctx->inuse = 1;
777 }
743 778
744 if (prev__cctx != next->cctx) 779 if (prev__cctx != next->cctx)
745 { 780 {
746 assert ( prev__cctx->inuse);
747 assert (!next->cctx->inuse);
748
749 prev__cctx->inuse = 0;
750 next->cctx->inuse = 1;
751
752 prev__cctx->top_env = PL_top_env; 781 prev__cctx->top_env = PL_top_env;
753 PL_top_env = next->cctx->top_env; 782 PL_top_env = next->cctx->top_env;
754 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 783 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
755 } 784 }
756 785
761} 790}
762 791
763struct transfer_args 792struct transfer_args
764{ 793{
765 struct coro *prev, *next; 794 struct coro *prev, *next;
766 int flags;
767}; 795};
768 796
769#define TRANSFER(ta) transfer ((ta).prev, (ta).next, (ta).flags) 797#define TRANSFER(ta) transfer ((ta).prev, (ta).next)
770 798
771static void 799static void
772coro_state_destroy (struct coro *coro) 800coro_state_destroy (struct coro *coro)
773{ 801{
774 if (coro->refcnt--) 802 if (coro->refcnt--)
775 return; 803 return;
776 804
777 if (coro->flags & CF_RUNNING)
778 croak ("FATAL: tried to destroy currently running coroutine");
779
780 if (coro->mainstack && coro->mainstack != main_mainstack) 805 if (coro->mainstack && coro->mainstack != main_mainstack)
781 { 806 {
782 struct coro temp; 807 struct coro temp;
808 Zero (&temp, 1, struct coro);
809 temp.save = CORO_SAVE_ALL;
783 810
784 SAVE ((&temp), TRANSFER_SAVE_ALL); 811 if (coro->flags & CF_RUNNING)
785 LOAD (coro); 812 croak ("FATAL: tried to destroy currently running coroutine");
813
814 save_perl (&temp);
815 load_perl (coro);
786 816
787 coro_destroy_stacks (); 817 coro_destroy_stacks ();
788 818
789 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 819 load_perl (&temp); /* this will get rid of defsv etc.. */
790 820
791 coro->mainstack = 0; 821 coro->mainstack = 0;
792 } 822 }
793 823
794 cctx_destroy (coro->cctx); 824 cctx_destroy (coro->cctx);
849 assert (mg->mg_type == PERL_MAGIC_ext); 879 assert (mg->mg_type == PERL_MAGIC_ext);
850 return (struct coro *)mg->mg_ptr; 880 return (struct coro *)mg->mg_ptr;
851} 881}
852 882
853static void 883static void
854prepare_transfer (struct transfer_args *ta, SV *prev, SV *next, int flags) 884prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv)
855{ 885{
856 ta->prev = SvSTATE (prev); 886 ta->prev = SvSTATE (prev_sv);
857 ta->next = SvSTATE (next); 887 ta->next = SvSTATE (next_sv);
858 ta->flags = flags;
859} 888}
860 889
861static void 890static void
862api_transfer (SV *prev, SV *next, int flags) 891api_transfer (SV *prev_sv, SV *next_sv)
863{ 892{
864 dTHX;
865 struct transfer_args ta; 893 struct transfer_args ta;
866 894
867 prepare_transfer (&ta, prev, next, flags); 895 prepare_transfer (&ta, prev_sv, next_sv);
868 TRANSFER (ta); 896 TRANSFER (ta);
897}
898
899static int
900api_save (SV *coro_sv, int new_save)
901{
902 struct coro *coro = SvSTATE (coro_sv);
903 int old_save = coro->save;
904
905 if (new_save >= 0)
906 coro->save = new_save;
907
908 return old_save;
869} 909}
870 910
871/** Coro ********************************************************************/ 911/** Coro ********************************************************************/
872 912
873#define PRIO_MAX 3 913#define PRIO_MAX 3
876#define PRIO_LOW -1 916#define PRIO_LOW -1
877#define PRIO_IDLE -3 917#define PRIO_IDLE -3
878#define PRIO_MIN -4 918#define PRIO_MIN -4
879 919
880/* for Coro.pm */ 920/* for Coro.pm */
881static GV *coro_current, *coro_idle; 921static SV *coro_current;
882static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 922static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
883static int coro_nready; 923static int coro_nready;
884 924
885static void 925static void
886coro_enq (SV *coro_sv) 926coro_enq (SV *coro_sv)
919 coro = SvSTATE (coro_sv); 959 coro = SvSTATE (coro_sv);
920 960
921 if (coro->flags & CF_READY) 961 if (coro->flags & CF_READY)
922 return 0; 962 return 0;
923 963
924 if (coro->flags & CF_RUNNING)
925 croak ("Coro::ready called on currently running coroutine");
926
927 coro->flags |= CF_READY; 964 coro->flags |= CF_READY;
928 965
929 LOCK; 966 LOCK;
930 coro_enq (SvREFCNT_inc (coro_sv)); 967 coro_enq (SvREFCNT_inc (coro_sv));
931 UNLOCK; 968 UNLOCK;
934} 971}
935 972
936static int 973static int
937api_is_ready (SV *coro_sv) 974api_is_ready (SV *coro_sv)
938{ 975{
939 return !!SvSTATE (coro_sv)->flags & CF_READY; 976 return !!(SvSTATE (coro_sv)->flags & CF_READY);
940} 977}
941 978
942static void 979static void
943prepare_schedule (struct transfer_args *ta) 980prepare_schedule (struct transfer_args *ta)
944{ 981{
945 SV *current, *prev, *next; 982 SV *prev, *next;
946
947 current = GvSV (coro_current);
948 983
949 for (;;) 984 for (;;)
950 { 985 {
951 LOCK; 986 LOCK;
952 next = coro_deq (PRIO_MIN); 987 next = coro_deq (PRIO_MIN);
961 ENTER; 996 ENTER;
962 SAVETMPS; 997 SAVETMPS;
963 998
964 PUSHMARK (SP); 999 PUSHMARK (SP);
965 PUTBACK; 1000 PUTBACK;
966 call_sv (GvSV (coro_idle), G_DISCARD); 1001 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
967 1002
968 FREETMPS; 1003 FREETMPS;
969 LEAVE; 1004 LEAVE;
970 } 1005 }
971 } 1006 }
972 1007
973 prev = SvRV (current); 1008 prev = SvRV (coro_current);
974 SvRV (current) = next; 1009 SvRV_set (coro_current, next);
975 1010
976 /* free this only after the transfer */ 1011 /* free this only after the transfer */
977 LOCK; 1012 LOCK;
978 free_coro_mortal (); 1013 free_coro_mortal ();
979 UNLOCK; 1014 UNLOCK;
980 coro_mortal = prev; 1015 coro_mortal = prev;
981 1016
1017 assert (!SvROK(prev));//D
1018 assert (!SvROK(next));//D
1019
982 ta->prev = SvSTATE (prev); 1020 ta->prev = SvSTATE (prev);
983 ta->next = SvSTATE (next); 1021 ta->next = SvSTATE (next);
984 ta->flags = TRANSFER_SAVE_ALL;
985 1022
1023 assert (ta->next->flags & CF_READY);
986 ta->next->flags &= ~CF_READY; 1024 ta->next->flags &= ~CF_READY;
987} 1025}
988 1026
989static void 1027static void
990prepare_cede (struct transfer_args *ta) 1028prepare_cede (struct transfer_args *ta)
991{ 1029{
992 api_ready (GvSV (coro_current)); 1030 api_ready (coro_current);
993
994 prepare_schedule (ta); 1031 prepare_schedule (ta);
995} 1032}
996 1033
1034static int
1035prepare_cede_notself (struct transfer_args *ta)
1036{
1037 if (coro_nready)
1038 {
1039 SV *prev = SvRV (coro_current);
1040 prepare_schedule (ta);
1041 api_ready (prev);
1042 return 1;
1043 }
1044 else
1045 return 0;
1046}
1047
997static void 1048static void
998api_schedule (void) 1049api_schedule (void)
999{ 1050{
1000 dTHX;
1001 struct transfer_args ta; 1051 struct transfer_args ta;
1002 1052
1003 prepare_schedule (&ta); 1053 prepare_schedule (&ta);
1004 TRANSFER (ta); 1054 TRANSFER (ta);
1005} 1055}
1006 1056
1007static void 1057static int
1008api_cede (void) 1058api_cede (void)
1009{ 1059{
1010 dTHX;
1011 struct transfer_args ta; 1060 struct transfer_args ta;
1012 1061
1013 prepare_cede (&ta); 1062 prepare_cede (&ta);
1063
1064 if (ta.prev != ta.next)
1065 {
1014 TRANSFER (ta); 1066 TRANSFER (ta);
1067 return 1;
1068 }
1069 else
1070 return 0;
1071}
1072
1073static int
1074api_cede_notself (void)
1075{
1076 struct transfer_args ta;
1077
1078 if (prepare_cede_notself (&ta))
1079 {
1080 TRANSFER (ta);
1081 return 1;
1082 }
1083 else
1084 return 0;
1015} 1085}
1016 1086
1017MODULE = Coro::State PACKAGE = Coro::State 1087MODULE = Coro::State PACKAGE = Coro::State
1018 1088
1019PROTOTYPES: DISABLE 1089PROTOTYPES: DISABLE
1025#endif 1095#endif
1026 BOOT_PAGESIZE; 1096 BOOT_PAGESIZE;
1027 1097
1028 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1098 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1029 1099
1030 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1100 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1031 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1101 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1032 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1102 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1103 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1104 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1033 1105
1034 main_mainstack = PL_mainstack; 1106 main_mainstack = PL_mainstack;
1035 1107
1036 coroapi.ver = CORO_API_VERSION; 1108 coroapi.ver = CORO_API_VERSION;
1037 coroapi.transfer = api_transfer; 1109 coroapi.transfer = api_transfer;
1047 HV *hv; 1119 HV *hv;
1048 int i; 1120 int i;
1049 1121
1050 Newz (0, coro, 1, struct coro); 1122 Newz (0, coro, 1, struct coro);
1051 coro->args = newAV (); 1123 coro->args = newAV ();
1124 coro->save = CORO_SAVE_ALL;
1125 coro->flags = CF_NEW;
1052 1126
1053 hv = newHV (); 1127 hv = newHV ();
1054 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1128 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1055 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1129 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1056 1130
1057 for (i = 1; i < items; i++) 1131 for (i = 1; i < items; i++)
1058 av_push (coro->args, newSVsv (ST (i))); 1132 av_push (coro->args, newSVsv (ST (i)));
1059} 1133}
1060 OUTPUT: 1134 OUTPUT:
1135 RETVAL
1136
1137int
1138save (SV *coro, int new_save = -1)
1139 CODE:
1140 RETVAL = api_save (coro, new_save);
1141 OUTPUT:
1061 RETVAL 1142 RETVAL
1062 1143
1063void 1144void
1064_set_stacklevel (...) 1145_set_stacklevel (...)
1065 ALIAS: 1146 ALIAS:
1066 Coro::State::transfer = 1 1147 Coro::State::transfer = 1
1067 Coro::schedule = 2 1148 Coro::schedule = 2
1068 Coro::cede = 3 1149 Coro::cede = 3
1069 Coro::Cont::yield = 4 1150 Coro::cede_notself = 4
1070 CODE: 1151 CODE:
1071{ 1152{
1072 struct transfer_args ta; 1153 struct transfer_args ta;
1073 1154
1074 switch (ix) 1155 switch (ix)
1075 { 1156 {
1076 case 0: 1157 case 0:
1077 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1158 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1078 ta.next = 0; 1159 ta.next = 0;
1079 ta.flags = TRANSFER_SET_STACKLEVEL;
1080 break; 1160 break;
1081 1161
1082 case 1: 1162 case 1:
1083 if (items != 3) 1163 if (items != 2)
1084 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1164 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1085 1165
1086 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1166 prepare_transfer (&ta, ST (0), ST (1));
1087 break; 1167 break;
1088 1168
1089 case 2: 1169 case 2:
1090 prepare_schedule (&ta); 1170 prepare_schedule (&ta);
1091 break; 1171 break;
1093 case 3: 1173 case 3:
1094 prepare_cede (&ta); 1174 prepare_cede (&ta);
1095 break; 1175 break;
1096 1176
1097 case 4: 1177 case 4:
1098 { 1178 if (!prepare_cede_notself (&ta))
1099 SV *yieldstack; 1179 XSRETURN_EMPTY;
1100 SV *sv;
1101 AV *defav = GvAV (PL_defgv);
1102 1180
1103 yieldstack = *hv_fetch (
1104 (HV *)SvRV (GvSV (coro_current)),
1105 "yieldstack", sizeof ("yieldstack") - 1,
1106 0
1107 );
1108
1109 /* set up @_ -- ugly */
1110 av_clear (defav);
1111 av_fill (defav, items - 1);
1112 while (items--)
1113 av_store (defav, items, SvREFCNT_inc (ST(items)));
1114
1115 sv = av_pop ((AV *)SvRV (yieldstack));
1116 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1117 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1118 ta.flags = 0;
1119 SvREFCNT_dec (sv);
1120 }
1121 break; 1181 break;
1122
1123 } 1182 }
1124 1183
1184 BARRIER;
1125 TRANSFER (ta); 1185 TRANSFER (ta);
1126} 1186}
1127 1187
1128void 1188void
1129_clone_state_from (SV *dst, SV *src) 1189_clone_state_from (SV *dst, SV *src)
1171 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1231 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1172 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1232 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1173 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1233 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1174 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1234 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1175 1235
1176 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV); 1236 coro_current = get_sv ("Coro::current", FALSE);
1177 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV); 1237 SvREADONLY_on (coro_current);
1178 1238
1179 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1239 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1180 coro_ready[i] = newAV (); 1240 coro_ready[i] = newAV ();
1181 1241
1182 { 1242 {
1183 SV *sv = perl_get_sv("Coro::API", 1); 1243 SV *sv = perl_get_sv("Coro::API", 1);
1184 1244
1185 coroapi.schedule = api_schedule; 1245 coroapi.schedule = api_schedule;
1246 coroapi.save = api_save;
1186 coroapi.cede = api_cede; 1247 coroapi.cede = api_cede;
1248 coroapi.cede_notself = api_cede_notself;
1187 coroapi.ready = api_ready; 1249 coroapi.ready = api_ready;
1188 coroapi.is_ready = api_is_ready; 1250 coroapi.is_ready = api_is_ready;
1189 coroapi.nready = &coro_nready; 1251 coroapi.nready = &coro_nready;
1190 coroapi.current = coro_current; 1252 coroapi.current = coro_current;
1191 1253
1192 GCoroAPI = &coroapi; 1254 GCoroAPI = &coroapi;
1193 sv_setiv (sv, (IV)&coroapi); 1255 sv_setiv (sv, (IV)&coroapi);
1194 SvREADONLY_on (sv); 1256 SvREADONLY_on (sv);
1195 } 1257 }
1196} 1258}
1259
1260void
1261_set_current (SV *current)
1262 PROTOTYPE: $
1263 CODE:
1264 SvREFCNT_dec (SvRV (coro_current));
1265 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1197 1266
1198int 1267int
1199prio (Coro::State coro, int newprio = 0) 1268prio (Coro::State coro, int newprio = 0)
1200 ALIAS: 1269 ALIAS:
1201 nice = 1 1270 nice = 1
1204 RETVAL = coro->prio; 1273 RETVAL = coro->prio;
1205 1274
1206 if (items > 1) 1275 if (items > 1)
1207 { 1276 {
1208 if (ix) 1277 if (ix)
1209 newprio += coro->prio; 1278 newprio = coro->prio - newprio;
1210 1279
1211 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1280 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1212 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1281 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1213 1282
1214 coro->prio = newprio; 1283 coro->prio = newprio;
1215 } 1284 }
1216} 1285}
1286 OUTPUT:
1287 RETVAL
1217 1288
1218SV * 1289SV *
1219ready (SV *self) 1290ready (SV *self)
1220 PROTOTYPE: $ 1291 PROTOTYPE: $
1221 CODE: 1292 CODE:
1243 1314
1244SV * 1315SV *
1245_get_state () 1316_get_state ()
1246 CODE: 1317 CODE:
1247{ 1318{
1248 struct { 1319 struct io_state *data;
1249 int errorno;
1250 int laststype;
1251 int laststatval;
1252 Stat_t statcache;
1253 } data;
1254 1320
1321 RETVAL = newSV (sizeof (struct io_state));
1322 data = (struct io_state *)SvPVX (RETVAL);
1323 SvCUR_set (RETVAL, sizeof (struct io_state));
1324 SvPOK_only (RETVAL);
1325
1255 data.errorno = errno; 1326 data->errorno = errno;
1256 data.laststype = PL_laststype; 1327 data->laststype = PL_laststype;
1257 data.laststatval = PL_laststatval; 1328 data->laststatval = PL_laststatval;
1258 data.statcache = PL_statcache; 1329 data->statcache = PL_statcache;
1259
1260 RETVAL = newSVpvn ((char *)&data, sizeof data);
1261} 1330}
1262 OUTPUT: 1331 OUTPUT:
1263 RETVAL 1332 RETVAL
1264 1333
1265void 1334void
1266_set_state (char *data_) 1335_set_state (char *data_)
1267 PROTOTYPE: $ 1336 PROTOTYPE: $
1268 CODE: 1337 CODE:
1269{ 1338{
1270 struct { 1339 struct io_state *data = (void *)data_;
1271 int errorno;
1272 int laststype;
1273 int laststatval;
1274 Stat_t statcache;
1275 } *data = (void *)data_;
1276 1340
1277 errno = data->errorno; 1341 errno = data->errorno;
1278 PL_laststype = data->laststype; 1342 PL_laststype = data->laststype;
1279 PL_laststatval = data->laststatval; 1343 PL_laststatval = data->laststatval;
1280 PL_statcache = data->statcache; 1344 PL_statcache = data->statcache;
1281} 1345}
1346

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines