# HG changeset patch # User Geoff Voelker # Date 831148400 0 # Node ID 6879c02a290cbc9d62ad885959c094eccc427b21 # Parent 6565b268b12a5847b23630b5d0ef6a0f77aaa6a4 Check to see if already included. (fd_set, filedesc): New structures. (child_process, MAX_CHILDREN, CHILD_ACTIVE): Definitions moved from ntproc.c. (FD_SET, FD_CLR, FD_ISSET, FD_ZERO): Operate on fd_set structures. (SELECT_TYPE): New macro. New child process status enumeration. (FILE_READ, FILE_WRITE, FILE_BINARY, FILE_PIPE, FILE_SOCKET): New macros. (fd_info, new_child, delete_child): Declared. diff -r 6565b268b12a -r 6879c02a290c src/w32.h --- a/src/w32.h Fri May 03 18:32:52 1996 +0000 +++ b/src/w32.h Fri May 03 18:33:20 1996 +0000 @@ -1,3 +1,6 @@ +#ifndef _NT_H_ +#define _NT_H_ + /* Support routines for the NT version of Emacs. Copyright (C) 1994 Free Software Foundation, Inc. @@ -18,28 +21,93 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* #define FULL_DEBUG */ +#define EMACSDEBUG + +#ifdef EMACSDEBUG +#define DebPrint(stuff) _DebPrint stuff +#else +#define DebPrint(stuff) +#endif + /* File descriptor set emulation. */ -#ifdef FD_SET -/* We could get this from param.h, but better not to depend on finding that. - And better not to risk that it might define other symbols used in this - file. */ -#ifdef FD_SETSIZE -#define MAXDESC FD_SETSIZE -#else -#define MAXDESC 64 -#endif +/* MSVC runtime library has limit of 64 descriptors by default */ +#define FD_SETSIZE 64 +typedef struct { + unsigned int bits[FD_SETSIZE / 32]; +} fd_set; + +/* standard access macros */ +#define FD_SET(n, p) \ + do { \ + if ((n) < FD_SETSIZE) { \ + (p)->bits[(n)/32] |= (1 << (n)%32); \ + } \ + } while (0) +#define FD_CLR(n, p) \ + do { \ + if ((n) < FD_SETSIZE) { \ + (p)->bits[(n)/32] &= ~(1 << (n)%32); \ + } \ + } while (0) +#define FD_ISSET(n, p) ((n) < FD_SETSIZE ? ((p)->bits[(n)/32] & (1 << (n)%32)) : 0) +#define FD_ZERO(p) memset((p), 0, sizeof(fd_set)) + #define SELECT_TYPE fd_set -#else /* no FD_SET */ -#define MAXDESC 32 -#define SELECT_TYPE int + +/* ------------------------------------------------------------------------- */ + +/* child_process.status values */ +enum { + STATUS_READ_ERROR = -1, + STATUS_READ_READY, + STATUS_READ_IN_PROGRESS, + STATUS_READ_FAILED, + STATUS_READ_SUCCEEDED, + STATUS_READ_ACKNOWLEDGED +}; + +/* This structure is used for both pipes and sockets; for + a socket, the process handle in pi is NULL. */ +typedef struct _child_process +{ + int fd; + int pid; + HANDLE char_avail; + HANDLE char_consumed; + HANDLE thrd; + PROCESS_INFORMATION procinfo; + volatile int status; + char chr; +} child_process; -/* Define the macros to access a single-int bitmap of descriptors. */ -#define FD_SET(n, p) (*(p) |= (1 << (n))) -#define FD_CLR(n, p) (*(p) &= ~(1 << (n))) -#define FD_ISSET(n, p) (*(p) & (1 << (n))) -#define FD_ZERO(p) (*(p) = 0) -#endif /* no FD_SET */ +#define MAXDESC FD_SETSIZE +#define MAX_CHILDREN MAXDESC/2 +#define CHILD_ACTIVE(cp) ((cp)->char_avail != NULL) + +/* parallel array of private info on file handles */ +typedef struct +{ + unsigned flags; + HANDLE hnd; + child_process * cp; +} filedesc; + +extern filedesc fd_info [ MAXDESC ]; + +/* fd_info flag definitions */ +#define FILE_READ 0x0001 +#define FILE_WRITE 0x0002 +#define FILE_BINARY 0x0010 +#define FILE_PIPE 0x0100 +#define FILE_SOCKET 0x0200 + +extern child_process * new_child (void); +extern void delete_child (child_process *cp); + +/* ------------------------------------------------------------------------- */ + /* Prepare our standard handles for proper inheritance by child processes. */ extern void prepare_standard_handles (int in, int out, @@ -50,5 +118,9 @@ int err, HANDLE handles[4]); /* Return the string resource associated with KEY of type TYPE. */ -extern LPBYTE nt_get_resource (char *key, LPDWORD type); +extern LPBYTE nt_get_resource (char * key, LPDWORD type); +extern void init_ntproc (); +extern void term_ntproc (); + +#endif /* _NT_H_ */