Use INTERNAL_FIELD for processes.

[bpt/emacs.git] / src / process.h

diff --git a/src/process.h b/src/process.h
index aff9e97..dafa870 100644 (file)
--- a/src/process.h
+++ b/src/process.h
@@ -1,5 +1,5 @@
 /* Definitions for asynchronous process control in GNU Emacs.
-   Copyright (C) 1985, 1994, 2001-2011  Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -26,57 +26,78 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "gnutls.h"
 #endif
 
-/* This structure records information about a subprocess
-   or network connection.
+/* Most code should use this macro to access
+   Lisp fields in struct Lisp_Process.  */
 
-   Every field in this structure except for the header
-   must be a Lisp_Object, for GC's sake.  */
+#define PVAR(w, field) ((w)->INTERNAL_FIELD (field))
+
+/* This structure records information about a subprocess
+   or network connection.  */
 
 struct Lisp_Process
   {
     struct vectorlike_header header;
 
     /* Name of subprocess terminal.  */
-    Lisp_Object tty_name;
+    Lisp_Object INTERNAL_FIELD (tty_name);
+
     /* Name of this process */
-    Lisp_Object name;
+    Lisp_Object INTERNAL_FIELD (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;
+    Lisp_Object INTERNAL_FIELD (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;
+    Lisp_Object INTERNAL_FIELD (filter);
+
     /* (funcall SENTINEL PROCESS) when process state changes */
-    Lisp_Object sentinel;
+    Lisp_Object INTERNAL_FIELD (sentinel);
+
     /* (funcall LOG SERVER CLIENT MESSAGE) when a server process
        accepts a connection from a client.  */
-    Lisp_Object log;
+    Lisp_Object INTERNAL_FIELD (log);
+
     /* Buffer that output is going to */
-    Lisp_Object buffer;
+    Lisp_Object INTERNAL_FIELD (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;
+
+    Lisp_Object INTERNAL_FIELD (childp);
+
     /* Plist for programs to keep per-process state information, parameters, etc.  */
-    Lisp_Object plist;
+    Lisp_Object INTERNAL_FIELD (plist);
+
     /* Symbol indicating the type of process: real, network, serial  */
-    Lisp_Object type;
+    Lisp_Object INTERNAL_FIELD (type);
+
     /* Marker set to end of last buffer-inserted output from this process */
-    Lisp_Object mark;
+    Lisp_Object INTERNAL_FIELD (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;
+    Lisp_Object INTERNAL_FIELD (status);
+
     /* Coding-system for decoding the input from this process.  */
-    Lisp_Object decode_coding_system;
+    Lisp_Object INTERNAL_FIELD (decode_coding_system);
+
     /* Working buffer for decoding.  */
-    Lisp_Object decoding_buf;
+    Lisp_Object INTERNAL_FIELD (decoding_buf);
+
     /* Coding-system for encoding the output to this process.  */
-    Lisp_Object encode_coding_system;
+    Lisp_Object INTERNAL_FIELD (encode_coding_system);
+
     /* Working buffer for encoding.  */
-    Lisp_Object encoding_buf;
+    Lisp_Object INTERNAL_FIELD (encoding_buf);
+
+    /* Queue for storing waiting writes */
+    Lisp_Object INTERNAL_FIELD (write_queue);
 
 #ifdef HAVE_GNUTLS
     Lisp_Object gnutls_cred_type;
@@ -95,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'.
@@ -134,6 +155,7 @@ struct Lisp_Process
     gnutls_certificate_client_credentials gnutls_x509_cred;
     gnutls_anon_client_credentials_t gnutls_anon_cred;
     int gnutls_log_level;
+    int gnutls_handshakes_tried;
     int gnutls_p;
 #endif
 };
@@ -160,12 +182,6 @@ extern int synch_process_termsig;
    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"
-#endif
-
 /* Nonzero means don't run process sentinels.  This is used
    when exiting.  */
 extern int inhibit_sentinels;