X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f49d1f52b2e368ef67dcfececd426de958548f4e..9c1a1306117d5c41be1beac981d33085fa0fe5a1:/src/process.h
diff --git a/src/process.h b/src/process.h
index 0350e95310..765e5d8256 100644
--- a/src/process.h
+++ b/src/process.h
@@ -1,6 +1,5 @@
/* Definitions for asynchronous process control in GNU Emacs.
- Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1994, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -20,66 +19,86 @@ along with GNU Emacs. If not, see . */
#ifdef HAVE_SYS_TYPES_H
#include
#endif
-#ifdef HAVE_UNISTD_H
+
#include
-#endif
#ifdef HAVE_GNUTLS
#include "gnutls.h"
#endif
-/* This structure records information about a subprocess
- or network connection.
+INLINE_HEADER_BEGIN
+#ifndef PROCESS_INLINE
+# define PROCESS_INLINE INLINE
+#endif
- Every field in this structure except for the first two
- must be a Lisp_Object, for GC's sake. */
+/* This structure records information about a subprocess
+ or network connection. */
struct Lisp_Process
{
- EMACS_UINT size;
- struct Lisp_Vector *v_next;
+ struct vectorlike_header header;
+
/* Name of subprocess terminal. */
Lisp_Object tty_name;
+
/* Name of this process */
Lisp_Object name;
+
/* List of command arguments that this process was run with.
Is set to t for a stopped network process; nil otherwise. */
Lisp_Object command;
+
/* (funcall FILTER PROC STRING) (if FILTER is non-nil)
to dispose of a bunch of chars from the process all at once */
Lisp_Object filter;
+
/* (funcall SENTINEL PROCESS) when process state changes */
Lisp_Object sentinel;
+
/* (funcall LOG SERVER CLIENT MESSAGE) when a server process
accepts a connection from a client. */
Lisp_Object log;
+
/* Buffer that output is going to */
Lisp_Object buffer;
+
/* t if this is a real child process. For a network or serial
connection, it is a plist based on the arguments to
make-network-process or make-serial-process. */
+
Lisp_Object childp;
+
/* Plist for programs to keep per-process state information, parameters, etc. */
Lisp_Object plist;
+
/* Symbol indicating the type of process: real, network, serial */
Lisp_Object type;
+
/* Marker set to end of last buffer-inserted output from this process */
Lisp_Object mark;
+
/* Symbol indicating status of process.
This may be a symbol: run, open, or closed.
Or it may be a list, whose car is stop, exit or signal
and whose cdr is a pair (EXIT_CODE . COREDUMP_FLAG)
or (SIGNAL_NUMBER . COREDUMP_FLAG). */
Lisp_Object status;
+
/* Coding-system for decoding the input from this process. */
Lisp_Object decode_coding_system;
+
/* Working buffer for decoding. */
Lisp_Object decoding_buf;
+
/* Coding-system for encoding the output to this process. */
Lisp_Object encode_coding_system;
+
/* Working buffer for encoding. */
Lisp_Object encoding_buf;
+ /* Queue for storing waiting writes */
+ Lisp_Object write_queue;
+
#ifdef HAVE_GNUTLS
Lisp_Object gnutls_cred_type;
#endif
@@ -97,17 +116,17 @@ struct Lisp_Process
/* Descriptor by which we write to this process */
int outfd;
/* Event-count of last event in which this process changed status. */
- int tick;
+ EMACS_INT tick;
/* Event-count of last such event reported. */
- int update_tick;
+ EMACS_INT update_tick;
/* Size of carryover in decoding. */
int decoding_carryover;
/* Hysteresis to try to read process output in larger blocks.
On some systems, e.g. GNU/Linux, Emacs is seen as
an interactive app also when reading process output, meaning
that process output can be read in as little as 1 byte at a
- time. Value is micro-seconds to delay reading output from
- this process. Range is 0 .. 50000. */
+ time. Value is nanoseconds to delay reading output from
+ this process. Range is 0 .. 50 * 1000 * 1000. */
int read_output_delay;
/* Should we delay reading output from this process.
Initialized from `Vprocess_adaptive_read_buffering'.
@@ -123,6 +142,9 @@ struct Lisp_Process
/* Flag to set coding-system of the process buffer from the
coding_system used to decode process output. */
unsigned int inherit_coding_system_flag : 1;
+ /* Whether the process is alive, i.e., can be waited for. Running
+ processes can be waited for, but exited and fake processes cannot. */
+ unsigned int alive : 1;
/* Record the process status in the raw form in which it comes from `wait'.
This is to avoid consing in a signal handler. The `raw_status_new'
flag indicates that `raw_status' contains a new status that still
@@ -136,70 +158,64 @@ struct Lisp_Process
gnutls_certificate_client_credentials gnutls_x509_cred;
gnutls_anon_client_credentials_t gnutls_anon_cred;
int gnutls_log_level;
- int gnutls_p;
+ int gnutls_handshakes_tried;
+ unsigned int gnutls_p : 1;
#endif
};
/* Every field in the preceding structure except for the first two
must be a Lisp_Object, for GC's sake. */
-#define ChannelMask(n) (1<<(n))
-
-/* Indexed by descriptor, gives the process (if any) for that descriptor. */
-extern Lisp_Object chan_process[];
+#define ChannelMask(n) (1 << (n))
-/* Alist of elements (NAME . PROCESS). */
-extern Lisp_Object Vprocess_alist;
+/* Most code should use these functions to set Lisp fields in struct
+ process. */
-/* True if we are about to fork off a synchronous process or if we
- are waiting for it. */
-extern int synch_process_alive;
+PROCESS_INLINE void
+pset_childp (struct Lisp_Process *p, Lisp_Object val)
+{
+ p->childp = val;
+}
-/* Communicate exit status of sync process to from sigchld_handler
- to Fcall_process. */
-
-/* Nonzero => this is a string explaining death of synchronous subprocess. */
-extern const char *synch_process_death;
-
-/* Nonzero => this is the signal number that terminated the subprocess. */
-extern int synch_process_termsig;
-
-/* If synch_process_death is zero,
- this is exit code of synchronous subprocess. */
-extern int synch_process_retcode;
-
-/* The name of the file open to get a null file, or a data sink.
- MS-DOS, and OS/2 redefine this. */
-#ifndef NULL_DEVICE
-#define NULL_DEVICE "/dev/null"
+#ifdef HAVE_GNUTLS
+PROCESS_INLINE void
+pset_gnutls_cred_type (struct Lisp_Process *p, Lisp_Object val)
+{
+ p->gnutls_cred_type = val;
+}
#endif
-/* Nonzero means don't run process sentinels. This is used
+/* True means don't run process sentinels. This is used
when exiting. */
-extern int inhibit_sentinels;
+extern bool inhibit_sentinels;
extern Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname;
extern Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime;
extern Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs;
extern Lisp_Object Quser, Qgroup, Qetime, Qpcpu, Qpmem, Qtpgid, Qcstime;
extern Lisp_Object Qtime, Qctime;
-extern Lisp_Object QCport, QCspeed, QCprocess;
+extern Lisp_Object QCspeed;
extern Lisp_Object QCbytesize, QCstopbits, QCparity, Qodd, Qeven;
extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary;
+/* Defined in callproc.c. */
+
+extern void record_kill_process (struct Lisp_Process *);
+
+/* Defined in process.c. */
+
extern Lisp_Object list_system_processes (void);
extern Lisp_Object system_process_attributes (Lisp_Object);
extern void hold_keyboard_input (void);
extern void unhold_keyboard_input (void);
-extern int kbd_on_hold_p (void);
+extern bool kbd_on_hold_p (void);
-typedef void (*fd_callback)(int fd, void *data, int for_read);
+typedef void (*fd_callback) (int fd, void *data);
extern void add_read_fd (int fd, fd_callback func, void *data);
extern void delete_read_fd (int fd);
extern void add_write_fd (int fd, fd_callback func, void *data);
extern void delete_write_fd (int fd);
-/* arch-tag: dffedfc4-d7bc-4b58-a26f-c16155449c72
- (do not change this comment) */
+INLINE_HEADER_END