Re: [PATCH] numactl: man page and --help output fixes

[Cliff Wickman <cpw@sgi.com>]

Thanks Petr.  Applied.

-Cliff

On Tue, Jul 30, 2013 at 01:47:14PM +0200, Petr Holasek wrote:
> Hi Cliff,
> 
> patch attached below fixes a few typos in numactl man page and adds short
> options to --help output.
> 
> Regards,
> Petr H
> 
> ---
> diff -up numactl-2.0.8/numactl.8.orig numactl-2.0.8/numactl.8
> --- numactl-2.0.8/numactl.8.orig	2013-07-30 12:57:29.377282653 +0200
> +++ numactl-2.0.8/numactl.8	2013-07-30 12:58:49.118288066 +0200
> @@ -272,14 +272,14 @@ numactl \-\-cpunodebind=0 \-\-membind=0,
>  Run process as above, but with an option (-l) that would be confused with
>  a numactl option.
>  
> -numactl \-\-nodebind=netdev:eth0 \-\-membind=netdev:eth0 network-server
> +numactl \-\-cpunodebind=netdev:eth0 \-\-membind=netdev:eth0 network-server
>  Run network-server on the node of network device eth0 with its memory
>  also in the same node.
>  
>  numactl \-\-preferred=1 numactl \-\-show
>  Set preferred node 1 and show the resulting state.
>  
> -numactl --interleave=all --shmkeyfile /tmp/shmkey 
> +numactl --interleave=all --shm /tmp/shmkey 
>  Interleave all of the sysv shared memory region specified by
>  /tmp/shmkey over all nodes.
>  
> diff -up numactl-2.0.8/numactl.c.orig numactl-2.0.8/numactl.c
> --- numactl-2.0.8/numactl.c.orig	2013-07-30 13:37:51.248447077 +0200
> +++ numactl-2.0.8/numactl.c	2013-07-30 13:36:09.642440179 +0200
> @@ -60,31 +60,32 @@ struct option opts[] = {
>  void usage(void)
>  {
>  	fprintf(stderr,
> -		"usage: numactl [--interleave=nodes] [--preferred=node]\n"
> -		"               [--physcpubind=cpus] [--cpunodebind=nodes]\n"
> -		"               [--membind=nodes] [--localalloc] command args ...\n"
> -		"       numactl [--show]\n"
> -		"       numactl [--hardware]\n"
> -		"       numactl [--length length] [--offset offset] [--shmmode shmmode]\n"
> -		"               [--strict]\n"
> -		"               [--shmid id] --shm shmkeyfile | --file tmpfsfile\n"
> -		"               [--huge] [--touch] \n"
> -		"               memory policy | --dump | --dump-nodes\n"
> +		"usage: numactl [--interleave= | -i <nodes>] [--preferred= | -p <node>]\n"
> +		"               [--physcpubind= | -C <cpus>] [--cpunodebind= | -N <nodes>]\n"
> +		"               [--membind= | -m <nodes>] [--localalloc | -l] command args ...\n"
> +		"       numactl [--show | -s]\n"
> +		"       numactl [--hardware | -H]\n"
> +		"       numactl [--length | -l <length>] [--offset | -o <offset>] [--shmmode | -M <shmmode>]\n"
> +		"               [--strict | -t]\n"
> +		"               [--shmid | -I <id>] --shm | -S <shmkeyfile>\n"
> +		"               [--shmid | -I <id>] --file | -f <tmpfsfile>\n"
> +		"               [--huge | -u] [--touch | -T] \n"
> +		"               memory policy | --dump | -d | --dump-nodes | -D\n"
>  		"\n"
> -		"memory policy is --interleave, --preferred, --membind, --localalloc\n"
> -		"nodes is a comma delimited list of node numbers or A-B ranges or all.\n"
> +		"memory policy is --interleave | -i, --preferred | -p, --membind | -m, --localalloc | -l\n"
> +		"<nodes> is a comma delimited list of node numbers or A-B ranges or all.\n"
>  		"Instead of a number a node can also be:\n"
>  		"  netdev:DEV the node connected to network device DEV\n"
>  		"  file:PATH  the node the block device of path is connected to\n"
>  		"  ip:HOST    the node of the network device host routes through\n"
>  		"  block:PATH the node of block device path\n"
>  		"  pci:[seg:]bus:dev[:func] The node of a PCI device\n"
> -		"cpus is a comma delimited list of cpu numbers or A-B ranges or all\n"
> +		"<cpus> is a comma delimited list of cpu numbers or A-B ranges or all\n"
>  		"all ranges can be inverted with !\n"
>  		"all numbers and ranges can be made cpuset-relative with +\n"
>  		"the old --cpubind argument is deprecated.\n"
>  		"use --cpunodebind or --physcpubind instead\n"
> -		"length can have g (GB), m (MB) or k (KB) suffixes\n");
> +		"<length> can have g (GB), m (MB) or k (KB) suffixes\n");
>  	exit(1);
>  }
>  

-- 
Cliff Wickman
SGI
cpw@sgi.com
(651) 683-3824