xemacs-beta: src/process.c comparison

comparison src/process.c @ 424:11054d720c21 r21-2-20

Import from CVS: tag r21-2-20

author	cvs
date	Mon, 13 Aug 2007 11:26:11 +0200
parents	41dbb7a9d5f2
children

comparison

equal deleted inserted replaced

-:28d9c139be4c
+:11054d720c21
 /* Valid values of process->status_symbol */
 Lisp_Object Qrun, Qstop;
 /* Qrun => Qopen, Qexit => Qclosed for "network connection" processes */
 Lisp_Object Qopen, Qclosed;
 /* Protocol families */
-Lisp_Object Qtcpip;
+Lisp_Object Qtcp, Qudp;
 #ifdef HAVE_MULTICAST
 Lisp_Object Qmulticast; /* Will be used for occasional warnings */
 #endif
 extern Lisp_Object Vlisp_EXEC_SUFFIXES;
 static Lisp_Object
-mark_process (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_process (Lisp_Object obj)
 {
 struct Lisp_Process *proc = XPROCESS (obj);
-MAYBE_PROCMETH (mark_process_data, (proc, markobj));
+MAYBE_PROCMETH (mark_process_data, (proc));
-markobj (proc->name);
+mark_object (proc->name);
-markobj (proc->command);
+mark_object (proc->command);
-markobj (proc->filter);
+mark_object (proc->filter);
-markobj (proc->sentinel);
+mark_object (proc->sentinel);
-markobj (proc->buffer);
+mark_object (proc->buffer);
-markobj (proc->mark);
+mark_object (proc->mark);
-markobj (proc->pid);
+mark_object (proc->pid);
-markobj (proc->pipe_instream);
+mark_object (proc->pipe_instream);
-markobj (proc->pipe_outstream);
+mark_object (proc->pipe_outstream);
 #ifdef FILE_CODING
-markobj (proc->coding_instream);
+mark_object (proc->coding_instream);
-markobj (proc->coding_outstream);
+mark_object (proc->coding_outstream);
 #endif
 return proc->status_symbol;
 }
 static void
 #ifdef HAVE_SOCKETS
 int
 network_connection_p (Lisp_Object process)
 {
-return GC_CONSP (XPROCESS (process)->pid);
+return CONSP (XPROCESS (process)->pid);
 }
 #endif
 DEFUN ("processp", Fprocessp, 1, 1, 0, /*
 Return t if OBJECT is a process.
 */
 (name))
 {
 Lisp_Object tail;
-if (GC_PROCESSP (name))
+if (PROCESSP (name))
 return name;
 if (!gc_in_progress)
 /* this only gets called during GC when emacs is going away as a result
 of a signal or crash. */
 CHECK_STRING (name);
-for (tail = Vprocess_list; GC_CONSP (tail); tail = XCDR (tail))
+for (tail = Vprocess_list; CONSP (tail); tail = XCDR (tail))
 {
 Lisp_Object proc = XCAR (tail);
 QUIT;
 if (internal_equal (name, XPROCESS (proc)->name, 0))
 return XCAR (tail);
 */
 (name))
 {
 Lisp_Object buf, tail, proc;
-if (GC_NILP (name)) return Qnil;
+if (NILP (name)) return Qnil;
 buf = Fget_buffer (name);
-if (GC_NILP (buf)) return Qnil;
+if (NILP (buf)) return Qnil;
-for (tail = Vprocess_list; GC_CONSP (tail); tail = XCDR (tail))
+for (tail = Vprocess_list; CONSP (tail); tail = XCDR (tail))
 {
 /* jwz: do not quit here - it isn't necessary, as there is no way for
 	 Vprocess_list to get circular or overwhelmingly long, and this
 	 function is called from layout_mode_element under redisplay. */
 /* QUIT; */
 proc = XCAR (tail);
-if (GC_PROCESSP (proc) && EQ (XPROCESS (proc)->buffer, buf))
+if (PROCESSP (proc) && EQ (XPROCESS (proc)->buffer, buf))
 	return proc;
 }
 return Qnil;
 }
 /* #### Look more closely into translating process names. */
 #endif
 /* This may be called during a GC from process_send_signal() from
 kill_buffer_processes() if emacs decides to abort(). */
-if (GC_PROCESSP (name))
+if (PROCESSP (name))
 return name;
-if (GC_STRINGP (name))
+if (STRINGP (name))
 {
 obj = Fget_process (name);
-if (GC_NILP (obj))
+if (NILP (obj))
 obj = Fget_buffer (name);
-if (GC_NILP (obj))
+if (NILP (obj))
 error ("Process %s does not exist", XSTRING_DATA (name));
 }
-else if (GC_NILP (name))
+else if (NILP (name))
 obj = Fcurrent_buffer ();
 else
 obj = name;
 /* Now obj should be either a buffer object or a process object.
 */
-if (GC_BUFFERP (obj))
+if (BUFFERP (obj))
 {
 proc = Fget_buffer_process (obj);
-if (GC_NILP (proc))
+if (NILP (proc))
 	error ("Buffer %s has no process", XSTRING_DATA (XBUFFER(obj)->name));
 }
 else
 {
 /* #### This was commented out. Although, simple
 connection has no PID; you cannot signal it.  All you can do is
 deactivate and close it via delete-process */
 DEFUN ("open-network-stream-internal", Fopen_network_stream_internal, 4, 5, 0, /*
 Open a TCP connection for a service to a host.
-Returns a subprocess-object to represent the connection.
+Return a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer-name) to associate with the process.
 Process output goes at end of that buffer, unless you specify
 BUFFER may also be nil, meaning that this process is not associated
 with any buffer.
 Third arg is name of the host to connect to, or its IP address.
 Fourth arg SERVICE is name of the service desired, or an integer
 specifying a port number to connect to.
-Fifth argument FAMILY is a protocol family. When omitted, 'tcp/ip
+Fifth argument PROTOCOL is a network protocol.  Currently 'tcp
-\(Internet protocol family TCP/IP) is assumed.
+(Transmission Control Protocol) and 'udp (User Datagram Protocol) are
-*/
+supported.  When omitted, 'tcp is assumed.
-(name, buffer, host, service, family))
+Ouput via `process-send-string' and input via buffer or filter (see
+`set-process-filter') are stream-oriented.  That means UDP datagrams are
+not guaranteed to be sent and received in discrete packets. (But small
+datagrams around 500 bytes that are not truncated by `process-send-string'
+are usually fine.)  Note further that UDP protocol does not guard against
+lost packets.
+*/
+(name, buffer, host, service, protocol))
 {
 /* !!#### This function has not been Mule-ized */
 /* This function can GC */
 Lisp_Object proc = Qnil;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5, ngcpro1;
 void *inch, *outch;
-GCPRO5 (name, buffer, host, service, family);
+GCPRO5 (name, buffer, host, service, protocol);
 CHECK_STRING (name);
-if (NILP(family))
+if (NILP(protocol))
-family = Qtcpip;
+protocol = Qtcp;
 else
-CHECK_SYMBOL (family);
+CHECK_SYMBOL (protocol);
 /* Since this code is inside HAVE_SOCKETS, existence of
 open_network_stream is mandatory */
-PROCMETH (open_network_stream, (name, host, service, family,
+PROCMETH (open_network_stream, (name, host, service, protocol,
 				  &inch, &outch));
 if (!NILP (buffer))
 buffer = Fget_buffer_create (buffer);
 proc = make_process_internal (name);
 #ifdef HAVE_MULTICAST
 DEFUN ("open-multicast-group-internal", Fopen_multicast_group_internal, 5, 5, 0, /*
 Open a multicast connection on the specified dest/port/ttl.
-Returns a subprocess-object to represent the connection.
+Return a subprocess-object to represent the connection.
 Input and output work as for subprocesses; `delete-process' closes it.
 NAME is name for process.  It is modified if necessary to make it unique.
 BUFFER is the buffer (or buffer-name) to associate with the process.
 Process output goes at end of that buffer, unless you specify
 signal_simple_error ("Process not open for writing", proc);
 if (nonrelocatable)
 lstream =
 make_fixed_buffer_input_stream (nonrelocatable + start, len);
-else if (GC_BUFFERP (relocatable))
+else if (BUFFERP (relocatable))
 lstream = make_lisp_buffer_input_stream (XBUFFER (relocatable),
 					     start, start + len, 0);
 else
 lstream = make_lisp_string_input_stream (relocatable, start, len);
 void
 kill_buffer_processes (Lisp_Object buffer)
 {
 Lisp_Object tail;
-for (tail = Vprocess_list; GC_CONSP (tail);
+for (tail = Vprocess_list; CONSP (tail);
 tail = XCDR (tail))
 {
 Lisp_Object proc = XCAR (tail);
-if (GC_PROCESSP (proc)
+if (PROCESSP (proc)
-	  && (GC_NILP (buffer) || GC_EQ (XPROCESS (proc)->buffer, buffer)))
+	  && (NILP (buffer) || EQ (XPROCESS (proc)->buffer, buffer)))
 	{
 	  if (network_connection_p (proc))
 	    Fdelete_process (proc);
 	  else if (!NILP (XPROCESS (proc)->pipe_instream))
 	    process_send_signal (proc, SIGHUP, 0, 1);
 defsymbol (&Qrun, "run");
 defsymbol (&Qstop, "stop");
 defsymbol (&Qopen, "open");
 defsymbol (&Qclosed, "closed");
-defsymbol (&Qtcpip, "tcp/ip");
+defsymbol (&Qtcp, "tcp");
+defsymbol (&Qudp, "udp");
 #ifdef HAVE_MULTICAST
 defsymbol(&Qmulticast, "multicast"); /* Used for occasional warnings */
 #endif

Mercurial > hg > xemacs-beta

comparison src/process.c @ 424:11054d720c21 r21-2-20