ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/EV/schmorp.h
(Generate patch)

Comparing EV/schmorp.h (file contents):
Revision 1.6 by root, Sat Jul 18 00:59:45 2009 UTC vs.
Revision 1.12 by root, Sat Apr 6 00:05:45 2013 UTC

1#ifndef SCHMORP_PERL_H_ 1#ifndef SCHMORP_PERL_H_
2#define SCHMORP_PERL_H_ 2#define SCHMORP_PERL_H_
3 3
4/* WARNING 4/* WARNING
5 * This header file is a shared resource between many modules. 5 * This header file is a shared resource between many modules.
6 * perl header files MUST already be included.
6 */ 7 */
7 8
8#include <signal.h> 9#include <signal.h>
9#include <errno.h> 10#include <errno.h>
10 11
11#ifndef _WIN32 12#if defined(WIN32 ) || defined(_MINIX)
13# define SCHMORP_H_PREFER_SELECT 1
14#endif
15
16#if !SCHMORP_H_PREFER_SELECT
12# include <poll.h> 17# include <poll.h>
13#endif 18#endif
14 19
15/* useful stuff, used by schmorp mostly */ 20/* useful stuff, used by schmorp mostly */
16 21
… …
20 (PERL_REVISION > (a) \ 25 (PERL_REVISION > (a) \
21 || (PERL_REVISION == (a) \ 26 || (PERL_REVISION == (a) \
22 && (PERL_VERSION > (b) \ 27 && (PERL_VERSION > (b) \
23 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c))))) 28 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
24 29
30#ifndef PERL_MAGIC_ext
31# define PERL_MAGIC_ext '~'
32#endif
33
25#if !PERL_VERSION_ATLEAST (5,6,0) 34#if !PERL_VERSION_ATLEAST (5,6,0)
26# ifndef PL_ppaddr 35# ifndef PL_ppaddr
27# define PL_ppaddr ppaddr 36# define PL_ppaddr ppaddr
28# endif 37# endif
29# ifndef call_sv 38# ifndef call_sv
… …
40# endif 49# endif
41# ifndef IS_PADCONST 50# ifndef IS_PADCONST
42# define IS_PADCONST(v) 0 51# define IS_PADCONST(v) 0
43# endif 52# endif
44#endif 53#endif
54
55/* use NV for 32 bit perls as it allows larger offsets */
56#if IVSIZE >= 8
57typedef IV VAL64;
58# define SvVAL64(sv) SvIV (sv)
59# define newSVval64(i64) newSViv (i64)
60#else
61typedef NV VAL64;
62# define SvVAL64(sv) SvNV (sv)
63# define newSVval64(i64) newSVnv (i64)
64#endif
65
66/* typemap for the above */
67/*
68VAL64 T_VAL64
69
70INPUT
71
72T_VAL64
73 $var = ($type)SvVAL64 ($arg);
74
75OUTPUT
76
77T_VAL64
78 $arg = newSVval64 ($var);
79*/
45 80
46/* 5.11 */ 81/* 5.11 */
47#ifndef CxHASARGS 82#ifndef CxHASARGS
48# define CxHASARGS(cx) (cx)->blk_sub.hasargs 83# define CxHASARGS(cx) (cx)->blk_sub.hasargs
49#endif 84#endif
… …
323} 358}
324 359
325#endif 360#endif
326 361
327#if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)) 362#if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
363# define SCHMORP_H_HAVE_EVENTFD 1
328/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 364/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
329# include <stdint.h> 365# include <stdint.h>
330# ifdef __cplusplus 366# ifdef __cplusplus
331extern "C" { 367extern "C" {
332# endif 368# endif
… …
400 * incompetent windows programmers - is this redundant? 436 * incompetent windows programmers - is this redundant?
401 */ 437 */
402 DWORD dummy; 438 DWORD dummy;
403 WriteFile (S_TO_HANDLE (epp->fd [1]), (LPCVOID)&dummy, 1, &dummy, 0); 439 WriteFile (S_TO_HANDLE (epp->fd [1]), (LPCVOID)&dummy, 1, &dummy, 0);
404#else 440#else
441# if SCHMORP_H_HAVE_EVENTFD
405 static uint64_t counter = 1; 442 static uint64_t counter = 1;
443# else
444 static char counter [8];
445# endif
406 /* some modules accept fd's from outside, support eventfd here */ 446 /* some modules accept fd's from outside, support eventfd here */
407 if (write (epp->fd [1], &counter, epp->len) < 0 447 if (write (epp->fd [1], &counter, epp->len) < 0
408 && errno == EINVAL 448 && errno == EINVAL
409 && epp->len != 8) 449 && epp->len != 8)
410 write (epp->fd [1], &counter, (epp->len = 8)); 450 write (epp->fd [1], &counter, (epp->len = 8));
… …
440 if (epp->len) 480 if (epp->len)
441 { 481 {
442 if (dup2 (epn.fd [0], epp->fd [0]) < 0) 482 if (dup2 (epn.fd [0], epp->fd [0]) < 0)
443 croak ("unable to dup over old event pipe"); /* should not croak */ 483 croak ("unable to dup over old event pipe"); /* should not croak */
444 484
445 if (epp->fd [1] != epp->fd [0])
446 close (epn.fd [0]); 485 close (epn.fd [0]);
486
487 if (epn.fd [0] == epn.fd [1])
488 epn.fd [1] = epp->fd [0];
447 489
448 epn.fd [0] = epp->fd [0]; 490 epn.fd [0] = epp->fd [0];
449 } 491 }
450 492
451 *epp = epn; 493 *epp = epn;
… …
457 499
458static int 500static int
459s_epipe_wait (s_epipe *epp) 501s_epipe_wait (s_epipe *epp)
460{ 502{
461 dTHX; 503 dTHX;
462#ifdef _WIN32 504#if SCHMORP_H_PREFER_SELECT
463 fd_set rfd; 505 fd_set rfd;
464 int fd = s_epipe_fd (epp); 506 int fd = s_epipe_fd (epp);
465 507
466 FD_ZERO (&rfd); 508 FD_ZERO (&rfd);
467 FD_SET (fd, &rfd); 509 FD_SET (fd, &rfd);
… …
472 struct pollfd pfd; 514 struct pollfd pfd;
473 515
474 pfd.fd = s_epipe_fd (epp); 516 pfd.fd = s_epipe_fd (epp);
475 pfd.events = POLLIN; 517 pfd.events = POLLIN;
476 518
477 return poll (&pfd, 1, 0); 519 return poll (&pfd, 1, -1);
478#endif 520#endif
479} 521}
480 522
481#endif 523#endif
482 524

Diff Legend

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