[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109355: Use INTERNAL_FIELD for proce
|
From: |
Dmitry Antipov |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109355: Use INTERNAL_FIELD for processes. |
|
Date: |
Wed, 01 Aug 2012 10:23:24 +0400 |
|
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109355
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2012-08-01 10:23:24 +0400
message:
Use INTERNAL_FIELD for processes.
* src/process.h (PVAR): New macro. Adjust style.
(struct Lisp_Process): Change Lisp_Object members to INTERNAL_FIELD.
* src/print.c, src/process.c, src/sysdep.c, src/w32.c:
* src/xdisp.c: Users changed.
* admin/coccinelle/process.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct Lisp_Process to PVAR.
added:
admin/coccinelle/process.cocci
modified:
admin/ChangeLog
src/ChangeLog
src/print.c
src/process.c
src/process.h
src/sysdep.c
src/w32.c
src/xdisp.c
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2012-08-01 05:11:36 +0000
+++ b/admin/ChangeLog 2012-08-01 06:23:24 +0000
@@ -1,5 +1,10 @@
2012-08-01 Dmitry Antipov <address@hidden>
+ * coccinelle/process.cocci: Semantic patch to replace direct
+ access to Lisp_Object members of struct Lisp_Process to PVAR.
+
+2012-08-01 Dmitry Antipov <address@hidden>
+
* coccinelle/window.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct window to WVAR.
=== added file 'admin/coccinelle/process.cocci'
--- a/admin/coccinelle/process.cocci 1970-01-01 00:00:00 +0000
+++ b/admin/coccinelle/process.cocci 2012-08-01 06:23:24 +0000
@@ -0,0 +1,110 @@
+// Change direct access to Lisp_Object fields of struct Lisp_Process to PVAR.
+@@
+struct Lisp_Process *P;
+Lisp_Object O;
+@@
+(
+- P->tty_name
++ PVAR (P, tty_name)
+|
+- P->name
++ PVAR (P, name)
+|
+- P->command
++ PVAR (P, command)
+|
+- P->filter
++ PVAR (P, filter)
+|
+- P->sentinel
++ PVAR (P, sentinel)
+|
+- P->log
++ PVAR (P, log)
+|
+- P->buffer
++ PVAR (P, buffer)
+|
+- P->childp
++ PVAR (P, childp)
+|
+- P->plist
++ PVAR (P, plist)
+|
+- P->type
++ PVAR (P, type)
+|
+- P->mark
++ PVAR (P, mark)
+|
+- P->status
++ PVAR (P, status)
+|
+- P->decode_coding_system
++ PVAR (P, decode_coding_system)
+|
+- P->decoding_buf
++ PVAR (P, decoding_buf)
+|
+- P->encode_coding_system
++ PVAR (P, encode_coding_system)
+|
+- P->encoding_buf
++ PVAR (P, encoding_buf)
+|
+- P->write_queue
++ PVAR (P, write_queue)
+
+|
+
+- XPROCESS (O)->tty_name
++ PVAR (XPROCESS (O), tty_name)
+|
+- XPROCESS (O)->name
++ PVAR (XPROCESS (O), name)
+|
+- XPROCESS (O)->command
++ PVAR (XPROCESS (O), command)
+|
+- XPROCESS (O)->filter
++ PVAR (XPROCESS (O), filter)
+|
+- XPROCESS (O)->sentinel
++ PVAR (XPROCESS (O), sentinel)
+|
+- XPROCESS (O)->log
++ PVAR (XPROCESS (O), log)
+|
+- XPROCESS (O)->buffer
++ PVAR (XPROCESS (O), buffer)
+|
+- XPROCESS (O)->childp
++ PVAR (XPROCESS (O), childp)
+|
+- XPROCESS (O)->plist
++ PVAR (XPROCESS (O), plist)
+|
+- XPROCESS (O)->type
++ PVAR (XPROCESS (O), type)
+|
+- XPROCESS (O)->mark
++ PVAR (XPROCESS (O), mark)
+|
+- XPROCESS (O)->status
++ PVAR (XPROCESS (O), status)
+|
+- XPROCESS (O)->decode_coding_system
++ PVAR (XPROCESS (O), decode_coding_system)
+|
+- XPROCESS (O)->decoding_buf
++ PVAR (XPROCESS (O), decoding_buf)
+|
+- XPROCESS (O)->encode_coding_system
++ PVAR (XPROCESS (O), encode_coding_system)
+|
+- XPROCESS (O)->encoding_buf
++ PVAR (XPROCESS (O), encoding_buf)
+|
+- XPROCESS (O)->write_queue
++ PVAR (XPROCESS (O), write_queue)
+)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-01 05:11:36 +0000
+++ b/src/ChangeLog 2012-08-01 06:23:24 +0000
@@ -1,5 +1,12 @@
2012-08-01 Dmitry Antipov <address@hidden>
+ Use INTERNAL_FIELD for processes.
+ * process.h (PVAR): New macro. Adjust style.
+ (struct Lisp_Process): Change Lisp_Object members to INTERNAL_FIELD.
+ * print.c, process.c, sysdep.c, w32.c, xdisp.c: Users changed.
+
+2012-08-01 Dmitry Antipov <address@hidden>
+
Use INTERNAL_FIELD for windows.
* window.h (WVAR): New macro.
(struct window): Change Lisp_Object members to INTERNAL_FIELD.
=== modified file 'src/print.c'
--- a/src/print.c 2012-08-01 05:11:36 +0000
+++ b/src/print.c 2012-08-01 06:23:24 +0000
@@ -1699,11 +1699,11 @@
if (escapeflag)
{
strout ("#<process ", -1, -1, printcharfun);
- print_string (XPROCESS (obj)->name, printcharfun);
+ print_string (PVAR (XPROCESS (obj), name), printcharfun);
PRINTCHAR ('>');
}
else
- print_string (XPROCESS (obj)->name, printcharfun);
+ print_string (PVAR (XPROCESS (obj), name), printcharfun);
}
else if (BOOL_VECTOR_P (obj))
{
=== modified file 'src/process.c'
--- a/src/process.c 2012-07-20 07:29:04 +0000
+++ b/src/process.c 2012-08-01 06:23:24 +0000
@@ -172,10 +172,10 @@
/* QCfilter is defined in keyboard.c. */
extern Lisp_Object QCfilter;
-#define NETCONN_P(p) (EQ (XPROCESS (p)->type, Qnetwork))
-#define NETCONN1_P(p) (EQ ((p)->type, Qnetwork))
-#define SERIALCONN_P(p) (EQ (XPROCESS (p)->type, Qserial))
-#define SERIALCONN1_P(p) (EQ ((p)->type, Qserial))
+#define NETCONN_P(p) (EQ (PVAR (XPROCESS (p), type), Qnetwork))
+#define NETCONN1_P(p) (EQ (PVAR (p, type), Qnetwork))
+#define SERIALCONN_P(p) (EQ (PVAR (XPROCESS (p), type), Qserial))
+#define SERIALCONN1_P(p) (EQ (PVAR (p, type), Qserial))
#ifndef HAVE_H_ERRNO
extern int h_errno;
@@ -428,7 +428,7 @@
update_status (struct Lisp_Process *p)
{
eassert (p->raw_status_new);
- p->status = status_convert (p->raw_status);
+ PVAR (p, status) = status_convert (p->raw_status);
p->raw_status_new = 0;
}
@@ -479,7 +479,7 @@
static Lisp_Object
status_message (struct Lisp_Process *p)
{
- Lisp_Object status = p->status;
+ Lisp_Object status = PVAR (p, status);
Lisp_Object symbol;
int code, coredump;
Lisp_Object string, string2;
@@ -626,8 +626,8 @@
p = allocate_process ();
/* Initialize Lisp data. Note that allocate_process initializes all
Lisp data to nil, so do it only for slots which should not be nil. */
- p->status = Qrun;
- p->mark = Fmake_marker ();
+ PVAR (p, status) = Qrun;
+ PVAR (p, mark) = Fmake_marker ();
/* Initialize non-Lisp data. Note that allocate_process zeroes out all
non-Lisp data, so do it only for slots which should not be zero. */
@@ -648,7 +648,7 @@
name1 = concat2 (name, make_formatted_string (suffix, "<%"pMd">", i));
}
name = name1;
- p->name = name;
+ PVAR (p, name) = name;
XSETPROCESS (val, p);
Vprocess_alist = Fcons (Fcons (name, val), Vprocess_alist);
return val;
@@ -745,7 +745,7 @@
p->raw_status_new = 0;
if (NETCONN1_P (p) || SERIALCONN1_P (p))
{
- p->status = Fcons (Qexit, Fcons (make_number (0), Qnil));
+ PVAR (p, status) = Fcons (Qexit, Fcons (make_number (0), Qnil));
p->tick = ++process_tick;
status_notify (p);
redisplay_preserve_echo_area (13);
@@ -763,9 +763,9 @@
/* If the process has already signaled, remove it from the list. */
if (p->raw_status_new)
update_status (p);
- symbol = p->status;
- if (CONSP (p->status))
- symbol = XCAR (p->status);
+ symbol = PVAR (p, status);
+ if (CONSP (PVAR (p, status)))
+ symbol = XCAR (PVAR (p, status));
if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
deleted_pid_list
= Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
@@ -774,7 +774,7 @@
{
Fkill_process (process, Qnil);
/* Do this now, since remove_process will make sigchld_handler do
nothing. */
- p->status
+ PVAR (p, status)
= Fcons (Qsignal, Fcons (make_number (SIGKILL), Qnil));
p->tick = ++process_tick;
status_notify (p);
@@ -816,14 +816,14 @@
p = XPROCESS (process);
if (p->raw_status_new)
update_status (p);
- status = p->status;
+ status = PVAR (p, status);
if (CONSP (status))
status = XCAR (status);
if (NETCONN1_P (p) || SERIALCONN1_P (p))
{
if (EQ (status, Qexit))
status = Qclosed;
- else if (EQ (p->command, Qt))
+ else if (EQ (PVAR (p, command), Qt))
status = Qstop;
else if (EQ (status, Qrun))
status = Qopen;
@@ -840,8 +840,8 @@
CHECK_PROCESS (process);
if (XPROCESS (process)->raw_status_new)
update_status (XPROCESS (process));
- if (CONSP (XPROCESS (process)->status))
- return XCAR (XCDR (XPROCESS (process)->status));
+ if (CONSP (PVAR (XPROCESS (process), status)))
+ return XCAR (XCDR (PVAR (XPROCESS (process), status)));
return make_number (0);
}
@@ -865,7 +865,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->name;
+ return PVAR (XPROCESS (process), name);
}
DEFUN ("process-command", Fprocess_command, Sprocess_command, 1, 1, 0,
@@ -877,7 +877,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->command;
+ return PVAR (XPROCESS (process), command);
}
DEFUN ("process-tty-name", Fprocess_tty_name, Sprocess_tty_name, 1, 1, 0,
@@ -887,7 +887,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->tty_name;
+ return PVAR (XPROCESS (process), tty_name);
}
DEFUN ("set-process-buffer", Fset_process_buffer, Sset_process_buffer,
@@ -902,9 +902,9 @@
if (!NILP (buffer))
CHECK_BUFFER (buffer);
p = XPROCESS (process);
- p->buffer = buffer;
+ PVAR (p, buffer) = buffer;
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- p->childp = Fplist_put (p->childp, QCbuffer, buffer);
+ PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCbuffer, buffer);
setup_process_coding_systems (process);
return buffer;
}
@@ -916,7 +916,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->buffer;
+ return PVAR (XPROCESS (process), buffer);
}
DEFUN ("process-mark", Fprocess_mark, Sprocess_mark,
@@ -925,7 +925,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->mark;
+ return PVAR (XPROCESS (process), mark);
}
DEFUN ("set-process-filter", Fset_process_filter, Sset_process_filter,
@@ -961,23 +961,23 @@
if (p->infd >= 0)
{
- if (EQ (filter, Qt) && !EQ (p->status, Qlisten))
+ if (EQ (filter, Qt) && !EQ (PVAR (p, status), Qlisten))
{
FD_CLR (p->infd, &input_wait_mask);
FD_CLR (p->infd, &non_keyboard_wait_mask);
}
- else if (EQ (p->filter, Qt)
+ else if (EQ (PVAR (p, filter), Qt)
/* Network or serial process not stopped: */
- && !EQ (p->command, Qt))
+ && !EQ (PVAR (p, command), Qt))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
}
}
- p->filter = filter;
+ PVAR (p, filter) = filter;
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- p->childp = Fplist_put (p->childp, QCfilter, filter);
+ PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCfilter, filter);
setup_process_coding_systems (process);
return filter;
}
@@ -989,7 +989,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->filter;
+ return PVAR (XPROCESS (process), filter);
}
DEFUN ("set-process-sentinel", Fset_process_sentinel, Sset_process_sentinel,
@@ -1004,9 +1004,9 @@
CHECK_PROCESS (process);
p = XPROCESS (process);
- p->sentinel = sentinel;
+ PVAR (p, sentinel) = sentinel;
if (NETCONN1_P (p) || SERIALCONN1_P (p))
- p->childp = Fplist_put (p->childp, QCsentinel, sentinel);
+ PVAR (p, childp) = Fplist_put (PVAR (p, childp), QCsentinel, sentinel);
return sentinel;
}
@@ -1017,7 +1017,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->sentinel;
+ return PVAR (XPROCESS (process), sentinel);
}
DEFUN ("set-process-window-size", Fset_process_window_size,
@@ -1102,7 +1102,7 @@
Lisp_Object contact;
CHECK_PROCESS (process);
- contact = XPROCESS (process)->childp;
+ contact = PVAR (XPROCESS (process), childp);
#ifdef DATAGRAM_SOCKETS
if (DATAGRAM_CONN_P (process)
@@ -1128,7 +1128,7 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return XPROCESS (process)->plist;
+ return PVAR (XPROCESS (process), plist);
}
DEFUN ("set-process-plist", Fset_process_plist, Sset_process_plist,
@@ -1139,7 +1139,7 @@
CHECK_PROCESS (process);
CHECK_LIST (plist);
- XPROCESS (process)->plist = plist;
+ PVAR (XPROCESS (process), plist) = plist;
return plist;
}
@@ -1151,7 +1151,7 @@
a socket connection. */)
(Lisp_Object process)
{
- return XPROCESS (process)->type;
+ return PVAR (XPROCESS (process), type);
}
#endif
@@ -1164,7 +1164,7 @@
{
Lisp_Object proc;
proc = get_process (process);
- return XPROCESS (proc)->type;
+ return PVAR (XPROCESS (proc), type);
}
DEFUN ("format-network-address", Fformat_network_address,
Sformat_network_address,
@@ -1325,13 +1325,13 @@
itself; it's all taken care of here. */
record_unwind_protect (start_process_unwind, proc);
- XPROCESS (proc)->childp = Qt;
- XPROCESS (proc)->plist = Qnil;
- XPROCESS (proc)->type = Qreal;
- XPROCESS (proc)->buffer = buffer;
- XPROCESS (proc)->sentinel = Qnil;
- XPROCESS (proc)->filter = Qnil;
- XPROCESS (proc)->command = Flist (nargs - 2, args + 2);
+ PVAR (XPROCESS (proc), childp) = Qt;
+ PVAR (XPROCESS (proc), plist) = Qnil;
+ PVAR (XPROCESS (proc), type) = Qreal;
+ PVAR (XPROCESS (proc), buffer) = buffer;
+ PVAR (XPROCESS (proc), sentinel) = Qnil;
+ PVAR (XPROCESS (proc), filter) = Qnil;
+ PVAR (XPROCESS (proc), command) = Flist (nargs - 2, args + 2);
#ifdef HAVE_GNUTLS
/* AKA GNUTLS_INITSTAGE(proc). */
@@ -1347,7 +1347,7 @@
/* Make the process marker point into the process buffer (if any). */
if (BUFFERP (buffer))
- set_marker_both (XPROCESS (proc)->mark, buffer,
+ set_marker_both (PVAR (XPROCESS (proc), mark), buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
@@ -1376,7 +1376,7 @@
else if (CONSP (Vdefault_process_coding_system))
val = XCAR (Vdefault_process_coding_system);
}
- XPROCESS (proc)->decode_coding_system = val;
+ PVAR (XPROCESS (proc), decode_coding_system) = val;
val = Vcoding_system_for_write;
if (NILP (val))
@@ -1396,7 +1396,7 @@
else if (CONSP (Vdefault_process_coding_system))
val = XCDR (Vdefault_process_coding_system);
}
- XPROCESS (proc)->encode_coding_system = val;
+ PVAR (XPROCESS (proc), encode_coding_system) = val;
/* Note: At this moment, the above coding system may leave
text-conversion or eol-conversion unspecified. They will be
decided after we read output from the process and decode it by
@@ -1405,9 +1405,9 @@
}
- XPROCESS (proc)->decoding_buf = empty_unibyte_string;
+ PVAR (XPROCESS (proc), decoding_buf) = empty_unibyte_string;
XPROCESS (proc)->decoding_carryover = 0;
- XPROCESS (proc)->encoding_buf = empty_unibyte_string;
+ PVAR (XPROCESS (proc), encoding_buf) = empty_unibyte_string;
XPROCESS (proc)->inherit_coding_system_flag
= !(NILP (buffer) || !inherit_process_coding_system);
@@ -1465,7 +1465,7 @@
{
if (NILP (arg_encoding))
arg_encoding = (complement_process_encoding_system
- (XPROCESS (proc)->encode_coding_system));
+ (PVAR (XPROCESS (proc),
encode_coding_system)));
XSETCAR (tem,
code_convert_string_norecord
(XCAR (tem), arg_encoding, 1));
@@ -1629,7 +1629,7 @@
more portable (see USG_SUBTTY_WORKS above). */
XPROCESS (process)->pty_flag = pty_flag;
- XPROCESS (process)->status = Qrun;
+ PVAR (XPROCESS (process), status) = Qrun;
/* Delay interrupts until we have a chance to store
the new fork's pid in its process structure */
@@ -1868,10 +1868,10 @@
#ifdef HAVE_PTYS
if (pty_flag)
- XPROCESS (process)->tty_name = build_string (pty_name);
+ PVAR (XPROCESS (process), tty_name) = build_string (pty_name);
else
#endif
- XPROCESS (process)->tty_name = Qnil;
+ PVAR (XPROCESS (process), tty_name) = Qnil;
#if !defined (WINDOWSNT) && defined (FD_CLOEXEC)
/* Wait for child_setup to complete in case that vfork is
@@ -1966,7 +1966,7 @@
more portable (see USG_SUBTTY_WORKS above). */
XPROCESS (process)->pty_flag = pty_flag;
- XPROCESS (process)->status = Qrun;
+ PVAR (XPROCESS (process), status) = Qrun;
setup_process_coding_systems (process);
FD_SET (inchannel, &input_wait_mask);
@@ -1977,10 +1977,10 @@
XPROCESS (process)->pid = -2;
#ifdef HAVE_PTYS
if (pty_flag)
- XPROCESS (process)->tty_name = build_string (pty_name);
+ PVAR (XPROCESS (process), tty_name) = build_string (pty_name);
else
#endif
- XPROCESS (process)->tty_name = Qnil;
+ PVAR (XPROCESS (process), tty_name) = Qnil;
}
@@ -2369,7 +2369,7 @@
if (set_socket_option (s, option, value))
{
- p->childp = Fplist_put (p->childp, option, value);
+ PVAR (p, childp) = Fplist_put (PVAR (p, childp), option, value);
return Qt;
}
@@ -2458,10 +2458,10 @@
proc = Fplist_get (contact, QCport);
proc = get_process (proc);
p = XPROCESS (proc);
- if (!EQ (p->type, Qserial))
+ if (!EQ (PVAR (p, type), Qserial))
error ("Not a serial process");
- if (NILP (Fplist_get (p->childp, QCspeed)))
+ if (NILP (Fplist_get (PVAR (p, childp), QCspeed)))
{
UNGCPRO;
return Qnil;
@@ -2602,21 +2602,21 @@
if (NILP (buffer))
buffer = name;
buffer = Fget_buffer_create (buffer);
- p->buffer = buffer;
+ PVAR (p, buffer) = buffer;
- p->childp = contact;
- p->plist = Fcopy_sequence (Fplist_get (contact, QCplist));
- p->type = Qserial;
- p->sentinel = Fplist_get (contact, QCsentinel);
- p->filter = Fplist_get (contact, QCfilter);
- p->log = Qnil;
+ PVAR (p, childp) = contact;
+ PVAR (p, plist) = Fcopy_sequence (Fplist_get (contact, QCplist));
+ PVAR (p, type) = Qserial;
+ PVAR (p, sentinel) = Fplist_get (contact, QCsentinel);
+ PVAR (p, filter) = Fplist_get (contact, QCfilter);
+ PVAR (p, log) = Qnil;
if (tem = Fplist_get (contact, QCnoquery), !NILP (tem))
p->kill_without_query = 1;
if (tem = Fplist_get (contact, QCstop), !NILP (tem))
- p->command = Qt;
+ PVAR (p, command) = Qt;
p->pty_flag = 0;
- if (!EQ (p->command, Qt))
+ if (!EQ (PVAR (p, command), Qt))
{
FD_SET (fd, &input_wait_mask);
FD_SET (fd, &non_keyboard_wait_mask);
@@ -2624,7 +2624,7 @@
if (BUFFERP (buffer))
{
- set_marker_both (p->mark, buffer,
+ set_marker_both (PVAR (p, mark), buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
}
@@ -2645,7 +2645,7 @@
else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer),
enable_multibyte_characters)))
|| (NILP (buffer) && NILP (BVAR (&buffer_defaults,
enable_multibyte_characters))))
val = Qnil;
- p->decode_coding_system = val;
+ PVAR (p, decode_coding_system) = val;
val = Qnil;
if (!NILP (tem))
@@ -2659,12 +2659,12 @@
else if ((!NILP (buffer) && NILP (BVAR (XBUFFER (buffer),
enable_multibyte_characters)))
|| (NILP (buffer) && NILP (BVAR (&buffer_defaults,
enable_multibyte_characters))))
val = Qnil;
- p->encode_coding_system = val;
+ PVAR (p, encode_coding_system) = val;
setup_process_coding_systems (proc);
- p->decoding_buf = empty_unibyte_string;
+ PVAR (p, decoding_buf) = empty_unibyte_string;
p->decoding_carryover = 0;
- p->encoding_buf = empty_unibyte_string;
+ PVAR (p, encoding_buf) = empty_unibyte_string;
p->inherit_coding_system_flag
= !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
@@ -3401,27 +3401,27 @@
p = XPROCESS (proc);
- p->childp = contact;
- p->plist = Fcopy_sequence (Fplist_get (contact, QCplist));
- p->type = Qnetwork;
+ PVAR (p, childp) = contact;
+ PVAR (p, plist) = Fcopy_sequence (Fplist_get (contact, QCplist));
+ PVAR (p, type) = Qnetwork;
- p->buffer = buffer;
- p->sentinel = sentinel;
- p->filter = filter;
- p->log = Fplist_get (contact, QClog);
+ PVAR (p, buffer) = buffer;
+ PVAR (p, sentinel) = sentinel;
+ PVAR (p, filter) = filter;
+ PVAR (p, log) = Fplist_get (contact, QClog);
if (tem = Fplist_get (contact, QCnoquery), !NILP (tem))
p->kill_without_query = 1;
if ((tem = Fplist_get (contact, QCstop), !NILP (tem)))
- p->command = Qt;
+ PVAR (p, command) = Qt;
p->pid = 0;
p->infd = inch;
p->outfd = outch;
if (is_server && socktype != SOCK_DGRAM)
- p->status = Qlisten;
+ PVAR (p, status) = Qlisten;
/* Make the process marker point into the process buffer (if any). */
if (BUFFERP (buffer))
- set_marker_both (p->mark, buffer,
+ set_marker_both (PVAR (p, mark), buffer,
BUF_ZV (XBUFFER (buffer)),
BUF_ZV_BYTE (XBUFFER (buffer)));
@@ -3431,7 +3431,7 @@
/* We may get here if connect did succeed immediately. However,
in that case, we still need to signal this like a non-blocking
connection. */
- p->status = Qconnect;
+ PVAR (p, status) = Qconnect;
if (!FD_ISSET (inch, &connect_wait_mask))
{
FD_SET (inch, &connect_wait_mask);
@@ -3443,8 +3443,8 @@
#endif
/* A server may have a client filter setting of Qt, but it must
still listen for incoming connects unless it is stopped. */
- if ((!EQ (p->filter, Qt) && !EQ (p->command, Qt))
- || (EQ (p->status, Qlisten) && NILP (p->command)))
+ if ((!EQ (PVAR (p, filter), Qt) && !EQ (PVAR (p, command), Qt))
+ || (EQ (PVAR (p, status), Qlisten) && NILP (PVAR (p, command))))
{
FD_SET (inch, &input_wait_mask);
FD_SET (inch, &non_keyboard_wait_mask);
@@ -3498,7 +3498,7 @@
else
val = Qnil;
}
- p->decode_coding_system = val;
+ PVAR (p, decode_coding_system) = val;
if (!NILP (tem))
{
@@ -3532,13 +3532,13 @@
else
val = Qnil;
}
- p->encode_coding_system = val;
+ PVAR (p, encode_coding_system) = val;
}
setup_process_coding_systems (proc);
- p->decoding_buf = empty_unibyte_string;
+ PVAR (p, decoding_buf) = empty_unibyte_string;
p->decoding_carryover = 0;
- p->encoding_buf = empty_unibyte_string;
+ PVAR (p, encoding_buf) = empty_unibyte_string;
p->inherit_coding_system_flag
= !(!NILP (tem) || NILP (buffer) || !inherit_process_coding_system);
@@ -4031,8 +4031,8 @@
return;
#endif
- if (!NILP (ps->log))
- call3 (ps->log, server, Qnil,
+ if (!NILP (PVAR (ps, log)))
+ call3 (PVAR (ps, log), server, Qnil,
concat3 (build_string ("accept failed with code"),
Fnumber_to_string (make_number (code)),
build_string ("\n")));
@@ -4102,15 +4102,15 @@
process name of the server process concatenated with the caller
identification. */
- if (!NILP (ps->filter) && !EQ (ps->filter, Qt))
+ if (!NILP (PVAR (ps, filter)) && !EQ (PVAR (ps, filter), Qt))
buffer = Qnil;
else
{
- buffer = ps->buffer;
+ buffer = PVAR (ps, buffer);
if (!NILP (buffer))
buffer = Fbuffer_name (buffer);
else
- buffer = ps->name;
+ buffer = PVAR (ps, name);
if (!NILP (buffer))
{
buffer = concat2 (buffer, caller);
@@ -4121,7 +4121,7 @@
/* Generate a unique name for the new server process. Combine the
server process name with the caller identification. */
- name = concat2 (ps->name, caller);
+ name = concat2 (PVAR (ps, name), caller);
proc = make_process (name);
chan_process[s] = proc;
@@ -4137,7 +4137,7 @@
p = XPROCESS (proc);
/* Build new contact information for this setup. */
- contact = Fcopy_sequence (ps->childp);
+ contact = Fcopy_sequence (PVAR (ps, childp));
contact = Fplist_put (contact, QCserver, Qnil);
contact = Fplist_put (contact, QChost, host);
if (!NILP (service))
@@ -4151,21 +4151,21 @@
conv_sockaddr_to_lisp (&saddr.sa, len));
#endif
- p->childp = contact;
- p->plist = Fcopy_sequence (ps->plist);
- p->type = Qnetwork;
+ PVAR (p, childp) = contact;
+ PVAR (p, plist) = Fcopy_sequence (PVAR (ps, plist));
+ PVAR (p, type) = Qnetwork;
- p->buffer = buffer;
- p->sentinel = ps->sentinel;
- p->filter = ps->filter;
- p->command = Qnil;
+ PVAR (p, buffer) = buffer;
+ PVAR (p, sentinel) = PVAR (ps, sentinel);
+ PVAR (p, filter) = PVAR (ps, filter);
+ PVAR (p, command) = Qnil;
p->pid = 0;
p->infd = s;
p->outfd = s;
- p->status = Qrun;
+ PVAR (p, status) = Qrun;
/* Client processes for accepted connections are not stopped initially. */
- if (!EQ (p->filter, Qt))
+ if (!EQ (PVAR (p, filter), Qt))
{
FD_SET (s, &input_wait_mask);
FD_SET (s, &non_keyboard_wait_mask);
@@ -4179,24 +4179,24 @@
of the new process should reflect the settings at the time the
server socket was opened; not the current settings. */
- p->decode_coding_system = ps->decode_coding_system;
- p->encode_coding_system = ps->encode_coding_system;
+ PVAR (p, decode_coding_system) = PVAR (ps, decode_coding_system);
+ PVAR (p, encode_coding_system) = PVAR (ps, encode_coding_system);
setup_process_coding_systems (proc);
- p->decoding_buf = empty_unibyte_string;
+ PVAR (p, decoding_buf) = empty_unibyte_string;
p->decoding_carryover = 0;
- p->encoding_buf = empty_unibyte_string;
+ PVAR (p, encoding_buf) = empty_unibyte_string;
p->inherit_coding_system_flag
= (NILP (buffer) ? 0 : ps->inherit_coding_system_flag);
- if (!NILP (ps->log))
- call3 (ps->log, server, proc,
+ if (!NILP (PVAR (ps, log)))
+ call3 (PVAR (ps, log), server, proc,
concat3 (build_string ("accept from "),
(STRINGP (host) ? host : build_string ("-")),
build_string ("\n")));
- if (!NILP (p->sentinel))
+ if (!NILP (PVAR (p, sentinel)))
exec_sentinel (proc,
concat3 (build_string ("open from "),
(STRINGP (host) ? host : build_string ("-")),
@@ -4287,7 +4287,8 @@
FD_ZERO (&Writeok);
if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
- && !(CONSP (wait_proc->status) && EQ (XCAR (wait_proc->status), Qexit)))
+ && !(CONSP (PVAR (wait_proc, status))
+ && EQ (XCAR (PVAR (wait_proc, status)), Qexit)))
message ("Blocking call to accept-process-output with quit inhibited!!");
/* If wait_proc is a process to watch, set wait_channel accordingly. */
@@ -4460,8 +4461,8 @@
if (wait_proc && wait_proc->raw_status_new)
update_status (wait_proc);
if (wait_proc
- && ! EQ (wait_proc->status, Qrun)
- && ! EQ (wait_proc->status, Qconnect))
+ && ! EQ (PVAR (wait_proc, status), Qrun)
+ && ! EQ (PVAR (wait_proc, status), Qconnect))
{
int nread, total_nread = 0;
@@ -4820,7 +4821,7 @@
continue;
/* If this is a server stream socket, accept connection. */
- if (EQ (XPROCESS (proc)->status, Qlisten))
+ if (EQ (PVAR (XPROCESS (proc), status), Qlisten))
{
server_accept_connection (proc, channel);
continue;
@@ -4889,7 +4890,7 @@
wait3() will not find the process object to
delete. Do it here. */
p->tick = ++process_tick;
- p->status = Qfailed;
+ PVAR (p, status) = Qfailed;
}
else
kill (getpid (), SIGCHLD);
@@ -4908,8 +4909,8 @@
deactivate_process (proc);
if (XPROCESS (proc)->raw_status_new)
update_status (XPROCESS (proc));
- if (EQ (XPROCESS (proc)->status, Qrun))
- XPROCESS (proc)->status
+ if (EQ (PVAR (XPROCESS (proc), status), Qrun))
+ PVAR (XPROCESS (proc), status)
= Fcons (Qexit, Fcons (make_number (256), Qnil));
}
}
@@ -4958,17 +4959,18 @@
if (xerrno)
{
p->tick = ++process_tick;
- p->status = Fcons (Qfailed, Fcons (make_number (xerrno),
Qnil));
+ PVAR (p, status)
+ = Fcons (Qfailed, Fcons (make_number (xerrno), Qnil));
deactivate_process (proc);
}
else
{
- p->status = Qrun;
+ PVAR (p, status) = Qrun;
/* Execute the sentinel here. If we had relied on
status_notify to do it later, it will read input
from the process before calling the sentinel. */
exec_sentinel (proc, build_string ("open\n"));
- if (!EQ (p->filter, Qt) && !EQ (p->command, Qt))
+ if (!EQ (PVAR (p, filter), Qt) && !EQ (PVAR (p, command), Qt))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
@@ -5040,7 +5042,7 @@
chars = alloca (carryover + readmax);
if (carryover)
/* See the comment above. */
- memcpy (chars, SDATA (p->decoding_buf), carryover);
+ memcpy (chars, SDATA (PVAR (p, decoding_buf)), carryover);
#ifdef DATAGRAM_SOCKETS
/* We have a working select, so proc_buffered_char is always -1. */
@@ -5119,7 +5121,7 @@
record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
/* Read and dispose of the process output. */
- outstream = p->filter;
+ outstream = PVAR (p, filter);
if (!NILP (outstream))
{
Lisp_Object text;
@@ -5161,9 +5163,9 @@
text = coding->dst_object;
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
/* A new coding system might be found. */
- if (!EQ (p->decode_coding_system, Vlast_coding_system_used))
+ if (!EQ (PVAR (p, decode_coding_system), Vlast_coding_system_used))
{
- p->decode_coding_system = Vlast_coding_system_used;
+ PVAR (p, decode_coding_system) = Vlast_coding_system_used;
/* Don't call setup_coding_system for
proc_decode_coding_system[channel] here. It is done in
@@ -5176,21 +5178,21 @@
proc_encode_coding_system[p->outfd] surely points to a
valid memory because p->outfd will be changed once EOF is
sent to the process. */
- if (NILP (p->encode_coding_system)
+ if (NILP (PVAR (p, encode_coding_system))
&& proc_encode_coding_system[p->outfd])
{
- p->encode_coding_system
+ PVAR (p, encode_coding_system)
= coding_inherit_eol_type (Vlast_coding_system_used, Qnil);
- setup_coding_system (p->encode_coding_system,
+ setup_coding_system (PVAR (p, encode_coding_system),
proc_encode_coding_system[p->outfd]);
}
}
if (coding->carryover_bytes > 0)
{
- if (SCHARS (p->decoding_buf) < coding->carryover_bytes)
- p->decoding_buf = make_uninit_string (coding->carryover_bytes);
- memcpy (SDATA (p->decoding_buf), coding->carryover,
+ if (SCHARS (PVAR (p, decoding_buf)) < coding->carryover_bytes)
+ PVAR (p, decoding_buf) = make_uninit_string
(coding->carryover_bytes);
+ memcpy (SDATA (PVAR (p, decoding_buf)), coding->carryover,
coding->carryover_bytes);
p->decoding_carryover = coding->carryover_bytes;
}
@@ -5226,7 +5228,7 @@
}
/* If no filter, write into buffer if it isn't dead. */
- else if (!NILP (p->buffer) && !NILP (BVAR (XBUFFER (p->buffer), name)))
+ else if (!NILP (PVAR (p, buffer)) && !NILP (BVAR (XBUFFER (PVAR (p,
buffer)), name)))
{
Lisp_Object old_read_only;
ptrdiff_t old_begv, old_zv;
@@ -5236,7 +5238,7 @@
Lisp_Object text;
struct buffer *b;
- Fset_buffer (p->buffer);
+ Fset_buffer (PVAR (p, buffer));
opoint = PT;
opoint_byte = PT_BYTE;
old_read_only = BVAR (current_buffer, read_only);
@@ -5250,9 +5252,11 @@
/* Insert new output into buffer
at the current end-of-output marker,
thus preserving logical ordering of input and output. */
- if (XMARKER (p->mark)->buffer)
- SET_PT_BOTH (clip_to_bounds (BEGV, marker_position (p->mark), ZV),
- clip_to_bounds (BEGV_BYTE, marker_byte_position (p->mark),
+ if (XMARKER (PVAR (p, mark))->buffer)
+ SET_PT_BOTH (clip_to_bounds (BEGV,
+ marker_position (PVAR (p, mark)), ZV),
+ clip_to_bounds (BEGV_BYTE,
+ marker_byte_position (PVAR (p, mark)),
ZV_BYTE));
else
SET_PT_BOTH (ZV, ZV_BYTE);
@@ -5269,23 +5273,23 @@
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
/* A new coding system might be found. See the comment in the
similar code in the previous `if' block. */
- if (!EQ (p->decode_coding_system, Vlast_coding_system_used))
+ if (!EQ (PVAR (p, decode_coding_system), Vlast_coding_system_used))
{
- p->decode_coding_system = Vlast_coding_system_used;
- if (NILP (p->encode_coding_system)
+ PVAR (p, decode_coding_system) = Vlast_coding_system_used;
+ if (NILP (PVAR (p, encode_coding_system))
&& proc_encode_coding_system[p->outfd])
{
- p->encode_coding_system
+ PVAR (p, encode_coding_system)
= coding_inherit_eol_type (Vlast_coding_system_used, Qnil);
- setup_coding_system (p->encode_coding_system,
+ setup_coding_system (PVAR (p, encode_coding_system),
proc_encode_coding_system[p->outfd]);
}
}
if (coding->carryover_bytes > 0)
{
- if (SCHARS (p->decoding_buf) < coding->carryover_bytes)
- p->decoding_buf = make_uninit_string (coding->carryover_bytes);
- memcpy (SDATA (p->decoding_buf), coding->carryover,
+ if (SCHARS (PVAR (p, decoding_buf)) < coding->carryover_bytes)
+ PVAR (p, decoding_buf) = make_uninit_string
(coding->carryover_bytes);
+ memcpy (SDATA (PVAR (p, decoding_buf)), coding->carryover,
coding->carryover_bytes);
p->decoding_carryover = coding->carryover_bytes;
}
@@ -5303,11 +5307,11 @@
/* Make sure the process marker's position is valid when the
process buffer is changed in the signal_after_change above.
W3 is known to do that. */
- if (BUFFERP (p->buffer)
- && (b = XBUFFER (p->buffer), b != current_buffer))
- set_marker_both (p->mark, p->buffer, BUF_PT (b), BUF_PT_BYTE (b));
+ if (BUFFERP (PVAR (p, buffer))
+ && (b = XBUFFER (PVAR (p, buffer)), b != current_buffer))
+ set_marker_both (PVAR (p, mark), PVAR (p, buffer), BUF_PT (b),
BUF_PT_BYTE (b));
else
- set_marker_both (p->mark, p->buffer, PT, PT_BYTE);
+ set_marker_both (PVAR (p, mark), PVAR (p, buffer), PT, PT_BYTE);
update_mode_lines++;
@@ -5401,9 +5405,9 @@
entry = Fcons (obj, Fcons (make_number (offset), make_number (len)));
if (front)
- p->write_queue = Fcons (entry, p->write_queue);
+ PVAR (p, write_queue) = Fcons (entry, PVAR (p, write_queue));
else
- p->write_queue = nconc2 (p->write_queue, Fcons (entry, Qnil));
+ PVAR (p, write_queue) = nconc2 (PVAR (p, write_queue), Fcons (entry,
Qnil));
}
/* Remove the first element in the write_queue of process P, put its
@@ -5417,11 +5421,11 @@
Lisp_Object entry, offset_length;
ptrdiff_t offset;
- if (NILP (p->write_queue))
+ if (NILP (PVAR (p, write_queue)))
return 0;
- entry = XCAR (p->write_queue);
- p->write_queue = XCDR (p->write_queue);
+ entry = XCAR (PVAR (p, write_queue));
+ PVAR (p, write_queue) = XCDR (PVAR (p, write_queue));
*obj = XCAR (entry);
offset_length = XCDR (entry);
@@ -5455,10 +5459,10 @@
if (p->raw_status_new)
update_status (p);
- if (! EQ (p->status, Qrun))
- error ("Process %s not running", SDATA (p->name));
+ if (! EQ (PVAR (p, status), Qrun))
+ error ("Process %s not running", SDATA (PVAR (p, name)));
if (p->outfd < 0)
- error ("Output file descriptor of %s is closed", SDATA (p->name));
+ error ("Output file descriptor of %s is closed", SDATA (PVAR (p, name)));
coding = proc_encode_coding_system[p->outfd];
Vlast_coding_system_used = CODING_ID_NAME (coding->id);
@@ -5468,9 +5472,9 @@
&& !NILP (BVAR (XBUFFER (object), enable_multibyte_characters)))
|| EQ (object, Qt))
{
- p->encode_coding_system
- = complement_process_encoding_system (p->encode_coding_system);
- if (!EQ (Vlast_coding_system_used, p->encode_coding_system))
+ PVAR (p, encode_coding_system)
+ = complement_process_encoding_system (PVAR (p, encode_coding_system));
+ if (!EQ (Vlast_coding_system_used, PVAR (p, encode_coding_system)))
{
/* The coding system for encoding was changed to raw-text
because we sent a unibyte text previously. Now we are
@@ -5480,8 +5484,8 @@
Another reason we come here is that the coding system
was just complemented and a new one was returned by
complement_process_encoding_system. */
- setup_coding_system (p->encode_coding_system, coding);
- Vlast_coding_system_used = p->encode_coding_system;
+ setup_coding_system (PVAR (p, encode_coding_system), coding);
+ Vlast_coding_system_used = PVAR (p, encode_coding_system);
}
coding->src_multibyte = 1;
}
@@ -5568,7 +5572,7 @@
/* If there is already data in the write_queue, put the new data
in the back of queue. Otherwise, ignore it. */
- if (!NILP (p->write_queue))
+ if (!NILP (PVAR (p, write_queue)))
write_queue_push (p, object, buf, len, 0);
do /* while !NILP (p->write_queue) */
@@ -5682,7 +5686,7 @@
cur_len -= written;
}
}
- while (!NILP (p->write_queue));
+ while (!NILP (PVAR (p, write_queue)));
}
else
{
@@ -5690,10 +5694,10 @@
proc = process_sent_to;
p = XPROCESS (proc);
p->raw_status_new = 0;
- p->status = Fcons (Qexit, Fcons (make_number (256), Qnil));
+ PVAR (p, status) = Fcons (Qexit, Fcons (make_number (256), Qnil));
p->tick = ++process_tick;
deactivate_process (proc);
- error ("SIGPIPE raised on process %s; closed it", SDATA (p->name));
+ error ("SIGPIPE raised on process %s; closed it", SDATA (PVAR (p,
name)));
}
}
@@ -5751,12 +5755,12 @@
pid_t gid = -1;
#ifdef TIOCGPGRP
- if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (p->tty_name))
+ if (ioctl (p->infd, TIOCGPGRP, &gid) == -1 && ! NILP (PVAR (p, tty_name)))
{
int fd;
/* Some OS:es (Solaris 8/9) does not allow TIOCGPGRP from the
master side. Try the slave side. */
- fd = emacs_open (SSDATA (p->tty_name), O_RDONLY, 0);
+ fd = emacs_open (SSDATA (PVAR (p, tty_name)), O_RDONLY, 0);
if (fd != -1)
{
@@ -5785,12 +5789,12 @@
proc = get_process (process);
p = XPROCESS (proc);
- if (!EQ (p->type, Qreal))
+ if (!EQ (PVAR (p, type), Qreal))
error ("Process %s is not a subprocess",
- SDATA (p->name));
+ SDATA (PVAR (p, name)));
if (p->infd < 0)
error ("Process %s is not active",
- SDATA (p->name));
+ SDATA (PVAR (p, name)));
gid = emacs_get_tty_pgrp (p);
@@ -5825,12 +5829,12 @@
proc = get_process (process);
p = XPROCESS (proc);
- if (!EQ (p->type, Qreal))
+ if (!EQ (PVAR (p, type), Qreal))
error ("Process %s is not a subprocess",
- SDATA (p->name));
+ SDATA (PVAR (p, name)));
if (p->infd < 0)
error ("Process %s is not active",
- SDATA (p->name));
+ SDATA (PVAR (p, name)));
if (!p->pty_flag)
current_group = Qnil;
@@ -5919,7 +5923,7 @@
#ifdef SIGCONT
case SIGCONT:
p->raw_status_new = 0;
- p->status = Qrun;
+ PVAR (p, status) = Qrun;
p->tick = ++process_tick;
if (!nomsg)
{
@@ -6009,13 +6013,13 @@
struct Lisp_Process *p;
p = XPROCESS (process);
- if (NILP (p->command)
+ if (NILP (PVAR (p, command))
&& p->infd >= 0)
{
FD_CLR (p->infd, &input_wait_mask);
FD_CLR (p->infd, &non_keyboard_wait_mask);
}
- p->command = Qt;
+ PVAR (p, command) = Qt;
return process;
}
#ifndef SIGTSTP
@@ -6038,9 +6042,9 @@
struct Lisp_Process *p;
p = XPROCESS (process);
- if (EQ (p->command, Qt)
+ if (EQ (PVAR (p, command), Qt)
&& p->infd >= 0
- && (!EQ (p->filter, Qt) || EQ (p->status, Qlisten)))
+ && (!EQ (PVAR (p, filter), Qt) || EQ (PVAR (p, status), Qlisten)))
{
FD_SET (p->infd, &input_wait_mask);
FD_SET (p->infd, &non_keyboard_wait_mask);
@@ -6051,7 +6055,7 @@
tcflush (p->infd, TCIFLUSH);
#endif /* not WINDOWSNT */
}
- p->command = Qnil;
+ PVAR (p, command) = Qnil;
return process;
}
#ifdef SIGCONT
@@ -6098,7 +6102,8 @@
CHECK_PROCESS (process);
pid = XPROCESS (process)->pid;
if (pid <= 0)
- error ("Cannot signal process %s", SDATA (XPROCESS (process)->name));
+ error ("Cannot signal process %s",
+ SDATA (PVAR (XPROCESS (process), name)));
}
#define parse_signal(NAME, VALUE) \
@@ -6242,8 +6247,8 @@
/* Make sure the process is really alive. */
if (XPROCESS (proc)->raw_status_new)
update_status (XPROCESS (proc));
- if (! EQ (XPROCESS (proc)->status, Qrun))
- error ("Process %s not running", SDATA (XPROCESS (proc)->name));
+ if (! EQ (PVAR (XPROCESS (proc), status), Qrun))
+ error ("Process %s not running", SDATA (PVAR (XPROCESS (proc), name)));
if (CODING_REQUIRE_FLUSHING (coding))
{
@@ -6253,7 +6258,7 @@
if (XPROCESS (proc)->pty_flag)
send_process (proc, "\004", 1, Qnil);
- else if (EQ (XPROCESS (proc)->type, Qserial))
+ else if (EQ (PVAR (XPROCESS (proc), type), Qserial))
{
#ifndef WINDOWSNT
if (tcdrain (XPROCESS (proc)->outfd) != 0)
@@ -6270,7 +6275,7 @@
for communication with the subprocess, call shutdown to cause EOF.
(In some old system, shutdown to socketpair doesn't work.
Then we just can't win.) */
- if (EQ (XPROCESS (proc)->type, Qnetwork)
+ if (EQ (PVAR (XPROCESS (proc), type), Qnetwork)
|| XPROCESS (proc)->outfd == XPROCESS (proc)->infd)
shutdown (XPROCESS (proc)->outfd, 1);
/* In case of socketpair, outfd == infd, so don't close it. */
@@ -6383,7 +6388,7 @@
{
proc = XCDR (XCAR (tail));
p = XPROCESS (proc);
- if (EQ (p->type, Qreal) && p->pid == pid)
+ if (EQ (PVAR (p, type), Qreal) && p->pid == pid)
break;
p = 0;
}
@@ -6467,7 +6472,7 @@
static Lisp_Object
exec_sentinel_unwind (Lisp_Object data)
{
- XPROCESS (XCAR (data))->sentinel = XCDR (data);
+ PVAR (XPROCESS (XCAR (data)), sentinel) = XCDR (data);
return Qnil;
}
@@ -6507,13 +6512,13 @@
friends don't expect current-buffer to be changed from under them. */
record_unwind_protect (set_buffer_if_live, Fcurrent_buffer ());
- sentinel = p->sentinel;
+ sentinel = PVAR (p, sentinel);
if (NILP (sentinel))
return;
/* Zilch the sentinel while it's running, to avoid recursive invocations;
assure that it gets restored no matter how the sentinel exits. */
- p->sentinel = Qnil;
+ PVAR (p, sentinel) = Qnil;
record_unwind_protect (exec_sentinel_unwind, Fcons (proc, sentinel));
/* Inhibit quit so that random quits don't screw up a running filter. */
specbind (Qinhibit_quit, Qt);
@@ -6601,16 +6606,16 @@
p->update_tick = p->tick;
/* If process is still active, read any output that remains. */
- while (! EQ (p->filter, Qt)
- && ! EQ (p->status, Qconnect)
- && ! EQ (p->status, Qlisten)
+ while (! EQ (PVAR (p, filter), Qt)
+ && ! EQ (PVAR (p, status), Qconnect)
+ && ! EQ (PVAR (p, status), Qlisten)
/* Network or serial process not stopped: */
- && ! EQ (p->command, Qt)
+ && ! EQ (PVAR (p, command), Qt)
&& p->infd >= 0
&& p != deleting_process
&& read_process_output (proc, p->infd) > 0);
- buffer = p->buffer;
+ buffer = PVAR (p, buffer);
/* Get the text to use for the message. */
if (p->raw_status_new)
@@ -6618,9 +6623,9 @@
msg = status_message (p);
/* If process is terminated, deactivate it or delete it. */
- symbol = p->status;
- if (CONSP (p->status))
- symbol = XCAR (p->status);
+ symbol = PVAR (p, status);
+ if (CONSP (PVAR (p, status)))
+ symbol = XCAR (PVAR (p, status));
if (EQ (symbol, Qsignal) || EQ (symbol, Qexit)
|| EQ (symbol, Qclosed))
@@ -6637,7 +6642,7 @@
this code to be run again. */
p->update_tick = p->tick;
/* Now output the message suitably. */
- if (!NILP (p->sentinel))
+ if (!NILP (PVAR (p, sentinel)))
exec_sentinel (proc, msg);
/* Don't bother with a message in the buffer
when a process becomes runnable. */
@@ -6659,8 +6664,8 @@
/* Insert new output into buffer
at the current end-of-output marker,
thus preserving logical ordering of input and output. */
- if (XMARKER (p->mark)->buffer)
- Fgoto_char (p->mark);
+ if (XMARKER (PVAR (p, mark))->buffer)
+ Fgoto_char (PVAR (p, mark));
else
SET_PT_BOTH (ZV, ZV_BYTE);
@@ -6670,11 +6675,11 @@
tem = BVAR (current_buffer, read_only);
BVAR (current_buffer, read_only) = Qnil;
insert_string ("\nProcess ");
- Finsert (1, &p->name);
+ Finsert (1, &PVAR (p, name));
insert_string (" ");
Finsert (1, &msg);
BVAR (current_buffer, read_only) = tem;
- set_marker_both (p->mark, p->buffer, PT, PT_BYTE);
+ set_marker_both (PVAR (p, mark), PVAR (p, buffer), PT, PT_BYTE);
if (opoint >= before)
SET_PT_BOTH (opoint + (PT - before),
@@ -6704,14 +6709,14 @@
CHECK_PROCESS (process);
p = XPROCESS (process);
if (p->infd < 0)
- error ("Input file descriptor of %s closed", SDATA (p->name));
+ error ("Input file descriptor of %s closed", SDATA (PVAR (p, name)));
if (p->outfd < 0)
- error ("Output file descriptor of %s closed", SDATA (p->name));
+ error ("Output file descriptor of %s closed", SDATA (PVAR (p, name)));
Fcheck_coding_system (decoding);
Fcheck_coding_system (encoding);
encoding = coding_inherit_eol_type (encoding, Qnil);
- p->decode_coding_system = decoding;
- p->encode_coding_system = encoding;
+ PVAR (p, decode_coding_system) = decoding;
+ PVAR (p, encode_coding_system) = encoding;
setup_process_coding_systems (process);
return Qnil;
@@ -6723,8 +6728,8 @@
(register Lisp_Object process)
{
CHECK_PROCESS (process);
- return Fcons (XPROCESS (process)->decode_coding_system,
- XPROCESS (process)->encode_coding_system);
+ return Fcons (PVAR (XPROCESS (process), decode_coding_system),
+ PVAR (XPROCESS (process), encode_coding_system));
}
DEFUN ("set-process-filter-multibyte", Fset_process_filter_multibyte,
@@ -6741,7 +6746,8 @@
CHECK_PROCESS (process);
p = XPROCESS (process);
if (NILP (flag))
- p->decode_coding_system = raw_text_coding_system (p->decode_coding_system);
+ PVAR (p, decode_coding_system)
+ = raw_text_coding_system (PVAR (p, decode_coding_system));
setup_process_coding_systems (process);
return Qnil;
@@ -7079,19 +7085,19 @@
if (!proc_decode_coding_system[inch])
proc_decode_coding_system[inch] = xmalloc (sizeof (struct coding_system));
- coding_system = p->decode_coding_system;
- if (! NILP (p->filter))
+ coding_system = PVAR (p, decode_coding_system);
+ if (! NILP (PVAR (p, filter)))
;
- else if (BUFFERP (p->buffer))
+ else if (BUFFERP (PVAR (p, buffer)))
{
- if (NILP (BVAR (XBUFFER (p->buffer), enable_multibyte_characters)))
+ if (NILP (BVAR (XBUFFER (PVAR (p, buffer)),
enable_multibyte_characters)))
coding_system = raw_text_coding_system (coding_system);
}
setup_coding_system (coding_system, proc_decode_coding_system[inch]);
if (!proc_encode_coding_system[outch])
proc_encode_coding_system[outch] = xmalloc (sizeof (struct coding_system));
- setup_coding_system (p->encode_coding_system,
+ setup_coding_system (PVAR (p, encode_coding_system),
proc_encode_coding_system[outch]);
#endif
}
@@ -7137,7 +7143,7 @@
for (tail = Vprocess_alist; CONSP (tail); tail = XCDR (tail))
{
proc = Fcdr (XCAR (tail));
- if (PROCESSP (proc) && EQ (XPROCESS (proc)->buffer, buf))
+ if (PROCESSP (proc) && EQ (PVAR (XPROCESS (proc), buffer), buf))
return proc;
}
#endif /* subprocesses */
@@ -7176,7 +7182,7 @@
{
proc = XCDR (XCAR (tail));
if (PROCESSP (proc)
- && (NILP (buffer) || EQ (XPROCESS (proc)->buffer, buffer)))
+ && (NILP (buffer) || EQ (PVAR (XPROCESS (proc), buffer), buffer)))
{
if (NETCONN_P (proc) || SERIALCONN_P (proc))
Fdelete_process (proc);
=== modified file 'src/process.h'
--- a/src/process.h 2012-07-31 22:24:49 +0000
+++ b/src/process.h 2012-08-01 06:23:24 +0000
@@ -26,59 +26,78 @@
#include "gnutls.h"
#endif
+/* Most code should use this macro to access
+ Lisp fields in struct Lisp_Process. */
+
+#define PVAR(w, field) ((w)->INTERNAL_FIELD (field))
+
/* This structure records information about a subprocess
- or network connection.
-
- Every field in this structure except for the header
- must be a Lisp_Object, for GC's sake. */
+ 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 write_queue;
+ Lisp_Object INTERNAL_FIELD (write_queue);
#ifdef HAVE_GNUTLS
Lisp_Object gnutls_cred_type;
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2012-07-20 07:29:04 +0000
+++ b/src/sysdep.c 2012-08-01 06:23:24 +0000
@@ -2156,7 +2156,7 @@
int err = -1;
char summary[4] = "???"; /* This usually becomes "8N1". */
- childp2 = Fcopy_sequence (p->childp);
+ childp2 = Fcopy_sequence (PVAR (p, childp));
/* Read port attributes and prepare default configuration. */
err = tcgetattr (p->outfd, &attr);
@@ -2174,7 +2174,7 @@
if (!NILP (Fplist_member (contact, QCspeed)))
tem = Fplist_get (contact, QCspeed);
else
- tem = Fplist_get (p->childp, QCspeed);
+ tem = Fplist_get (PVAR (p, childp), QCspeed);
CHECK_NUMBER (tem);
err = cfsetspeed (&attr, XINT (tem));
if (err != 0)
@@ -2186,7 +2186,7 @@
if (!NILP (Fplist_member (contact, QCbytesize)))
tem = Fplist_get (contact, QCbytesize);
else
- tem = Fplist_get (p->childp, QCbytesize);
+ tem = Fplist_get (PVAR (p, childp), QCbytesize);
if (NILP (tem))
tem = make_number (8);
CHECK_NUMBER (tem);
@@ -2207,7 +2207,7 @@
if (!NILP (Fplist_member (contact, QCparity)))
tem = Fplist_get (contact, QCparity);
else
- tem = Fplist_get (p->childp, QCparity);
+ tem = Fplist_get (PVAR (p, childp), QCparity);
if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd))
error (":parity must be nil (no parity), `even', or `odd'");
#if defined (PARENB) && defined (PARODD) && defined (IGNPAR) && defined (INPCK)
@@ -2240,7 +2240,7 @@
if (!NILP (Fplist_member (contact, QCstopbits)))
tem = Fplist_get (contact, QCstopbits);
else
- tem = Fplist_get (p->childp, QCstopbits);
+ tem = Fplist_get (PVAR (p, childp), QCstopbits);
if (NILP (tem))
tem = make_number (1);
CHECK_NUMBER (tem);
@@ -2262,7 +2262,7 @@
if (!NILP (Fplist_member (contact, QCflowcontrol)))
tem = Fplist_get (contact, QCflowcontrol);
else
- tem = Fplist_get (p->childp, QCflowcontrol);
+ tem = Fplist_get (PVAR (p, childp), QCflowcontrol);
if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw))
error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'");
#if defined (CRTSCTS)
@@ -2304,7 +2304,7 @@
error ("tcsetattr() failed: %s", emacs_strerror (errno));
childp2 = Fplist_put (childp2, QCsummary, build_string (summary));
- p->childp = childp2;
+ PVAR (p, childp) = childp2;
}
#endif /* not DOS_NT */
=== modified file 'src/w32.c'
--- a/src/w32.c 2012-07-29 16:22:27 +0000
+++ b/src/w32.c 2012-08-01 06:23:24 +0000
@@ -6144,7 +6144,7 @@
error ("Not a serial process");
hnd = fd_info[ p->outfd ].hnd;
- childp2 = Fcopy_sequence (p->childp);
+ childp2 = Fcopy_sequence (PVAR (p, childp));
/* Initialize timeouts for blocking read and blocking write. */
if (!GetCommTimeouts (hnd, &ct))
@@ -6173,7 +6173,7 @@
if (!NILP (Fplist_member (contact, QCspeed)))
tem = Fplist_get (contact, QCspeed);
else
- tem = Fplist_get (p->childp, QCspeed);
+ tem = Fplist_get (PVAR (p, childp), QCspeed);
CHECK_NUMBER (tem);
dcb.BaudRate = XINT (tem);
childp2 = Fplist_put (childp2, QCspeed, tem);
@@ -6182,7 +6182,7 @@
if (!NILP (Fplist_member (contact, QCbytesize)))
tem = Fplist_get (contact, QCbytesize);
else
- tem = Fplist_get (p->childp, QCbytesize);
+ tem = Fplist_get (PVAR (p, childp), QCbytesize);
if (NILP (tem))
tem = make_number (8);
CHECK_NUMBER (tem);
@@ -6196,7 +6196,7 @@
if (!NILP (Fplist_member (contact, QCparity)))
tem = Fplist_get (contact, QCparity);
else
- tem = Fplist_get (p->childp, QCparity);
+ tem = Fplist_get (PVAR (p, childp), QCparity);
if (!NILP (tem) && !EQ (tem, Qeven) && !EQ (tem, Qodd))
error (":parity must be nil (no parity), `even', or `odd'");
dcb.fParity = FALSE;
@@ -6226,7 +6226,7 @@
if (!NILP (Fplist_member (contact, QCstopbits)))
tem = Fplist_get (contact, QCstopbits);
else
- tem = Fplist_get (p->childp, QCstopbits);
+ tem = Fplist_get (PVAR (p, childp), QCstopbits);
if (NILP (tem))
tem = make_number (1);
CHECK_NUMBER (tem);
@@ -6243,7 +6243,7 @@
if (!NILP (Fplist_member (contact, QCflowcontrol)))
tem = Fplist_get (contact, QCflowcontrol);
else
- tem = Fplist_get (p->childp, QCflowcontrol);
+ tem = Fplist_get (PVAR (p, childp), QCflowcontrol);
if (!NILP (tem) && !EQ (tem, Qhw) && !EQ (tem, Qsw))
error (":flowcontrol must be nil (no flowcontrol), `hw', or `sw'");
dcb.fOutxCtsFlow = FALSE;
@@ -6277,7 +6277,7 @@
error ("SetCommState() failed");
childp2 = Fplist_put (childp2, QCsummary, build_string (summary));
- p->childp = childp2;
+ PVAR (p, childp) = childp2;
}
#ifdef HAVE_GNUTLS
=== modified file 'src/xdisp.c'
--- a/src/xdisp.c 2012-08-01 05:11:36 +0000
+++ b/src/xdisp.c 2012-08-01 06:23:24 +0000
@@ -21678,10 +21678,10 @@
obj = Fget_buffer_process (Fcurrent_buffer ());
if (PROCESSP (obj))
{
- p = decode_mode_spec_coding (XPROCESS (obj)->decode_coding_system,
- p, eol_flag);
- p = decode_mode_spec_coding (XPROCESS (obj)->encode_coding_system,
- p, eol_flag);
+ p = decode_mode_spec_coding
+ (PVAR (XPROCESS (obj), decode_coding_system), p, eol_flag);
+ p = decode_mode_spec_coding
+ (PVAR (XPROCESS (obj), encode_coding_system), p, eol_flag);
}
#endif /* subprocesses */
#endif /* 0 */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109355: Use INTERNAL_FIELD for processes.,
Dmitry Antipov <=