Finish renaming standard IO variables, and more man page updates.

doc/man/man1/slaunch.1

@@ -130,15 +130,21 @@ data to standard output or error, this can be performance limiting.)
 .PD
 Instruct SLURM to connect each task's standard input, standard output,
 or standard error directly to the file name specified
-in the "\fIfilename pattern\fR".  Unlike the \-\-slaunch\-[input|output|error]
-options, standard IO traffic is NOT transferred between the tasks and slaunch
-for the specified input, output, or error stream.
+in the "\fIfilename pattern\fR".
+
+By default, the standard IO streams of all tasks are received and transmitted
+over the network to commands like slaunch and sattach.  These options disable
+the networked standard IO streams and instead connect the standard IO streams
+of the tasks directly to files on the local node of each task (although the file
+may, of course, be located on a networked filesystem).
+
+Whether or not the tasks share a file depends on whether or not the file lives
+on a local filesystem or a shared network filesytem, and on whether or not
+the filename pattern expands to the same file name for each task.
 
 The filename pattern may
 contain one or more replacement symbols, which are a percent sign "%" followed 
-by a letter (e.g. %t).  If a replacement symbol is expanded to a
-different string for each task, then each task will be connected to a
-different file.
+by a letter (e.g. %t).
 
 Supported replacement symbols are:
 .PD 0

src/slaunch/opt.h

@@ -88,15 +88,15 @@ typedef struct slaunch_options {
 	char *local_ofname;	/* --local-output, -o filename  */
 	char *local_ifname;	/* --local-input,  -i filename  */
 	char *local_efname;	/* --local-error, -e filename   */
-	uint32_t local_input_taskid;
-	uint32_t local_output_taskid;
-	uint32_t local_error_taskid;
+	uint32_t local_input_filter;
+	uint32_t local_output_filter;
+	uint32_t local_error_filter;
 	char *remote_ofname;	/* --remote-output filename     */
 	char *remote_ifname;	/* --remote-input filename      */
 	char *remote_efname;	/* --remote-error filename      */
-	uint32_t remote_input_taskid;
-	uint32_t remote_output_taskid;
-	uint32_t remote_error_taskid;
+	uint32_t remote_input_filter;
+	uint32_t remote_output_filter;
+	uint32_t remote_error_filter;
 
 	int  slurmd_debug;	/* --slurmd-debug, -D           */
 	core_format_t core_type;/* --core= 	        	*/

src/slaunch/slaunch.c

@@ -528,12 +528,12 @@ _setup_local_fds(slurm_step_io_fds_t *cio_fds, slurm_step_ctx ctx)
 		if (cio_fds->in.fd == -1)
 			fatal("Could not open stdin file: %m");
 	}
-	if (opt.local_input_taskid != (uint32_t)-1) {
-		cio_fds->in.taskid = opt.local_input_taskid;
+	if (opt.local_input_filter != (uint32_t)-1) {
+		cio_fds->in.taskid = opt.local_input_filter;
 		/* FIXME - don't peek into the step context, that's cheating! */
 		cio_fds->in.nodeid =
 			_taskid_to_nodeid(step_ctx->step_resp->step_layout,
-					  opt.local_input_taskid);
+					  opt.local_input_filter);
 	}
 
 	/*
@@ -547,8 +547,8 @@ _setup_local_fds(slurm_step_io_fds_t *cio_fds, slurm_step_ctx ctx)
 		if (cio_fds->out.fd == -1)
 			fatal("Could not open stdout file: %m");
 	}
-	if (opt.local_output_taskid != (uint32_t)-1) {
-		cio_fds->out.taskid = opt.local_output_taskid;
+	if (opt.local_output_filter != (uint32_t)-1) {
+		cio_fds->out.taskid = opt.local_output_filter;
 	}
 
 	/* FIXME - need to change condition for shared output and error */
@@ -575,8 +575,8 @@ _setup_local_fds(slurm_step_io_fds_t *cio_fds, slurm_step_ctx ctx)
 			if (cio_fds->err.fd == -1)
 				fatal("Could not open stderr file: %m");
 		}
-		if (opt.local_error_taskid != (uint32_t)-1) {
-			cio_fds->err.taskid = opt.local_error_taskid;
+		if (opt.local_error_filter != (uint32_t)-1) {
+			cio_fds->err.taskid = opt.local_error_filter;
 		}
 	}
 }