Attachment 302581 Details for Bug 442521 – updated patch

[patch] updated patch

numactl.patch (text/plain), 1.85 KB, created by Neil Horman on 2008-04-16 11:30:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-04-16 11:30:38 UTC

Size: 1.85 KB

patch

obsolete

>diff -up numactl-0.9.8/numactl-0.9.8/numactl.c.orig numactl-0.9.8/numactl-0.9.8/numactl.c
>--- numactl-0.9.8/numactl-0.9.8/numactl.c.orig	2008-04-16 07:20:25.000000000 -0400
>+++ numactl-0.9.8/numactl-0.9.8/numactl.c	2008-04-16 07:20:43.000000000 -0400
>@@ -304,13 +304,13 @@ int main(int ac, char **av)
> 			break;
> 		case 'C': /* --physcpubind */
> 		{
>-			int ncpus;
>+			int bufsz;
> 			unsigned long *cpubuf;
>-			cpubuf = cpumask(optarg, &ncpus);
>+			cpubuf = cpumask(optarg, &bufsz);
> 			errno = 0;
> 			check_cpubind(do_shm);
> 			did_cpubind = 1;
>-			numa_sched_setaffinity(0, CPU_BYTES(ncpus), cpubuf);
>+			numa_sched_setaffinity(0, bufsz, cpubuf);
> 			checkerror("sched_setaffinity");
> 			free(cpubuf);
> 			break;
>diff -up numactl-0.9.8/numactl-0.9.8/util.h.orig numactl-0.9.8/numactl-0.9.8/util.h
>--- numactl-0.9.8/numactl-0.9.8/util.h.orig	2008-04-16 07:19:57.000000000 -0400
>+++ numactl-0.9.8/numactl-0.9.8/util.h	2008-04-16 07:20:08.000000000 -0400
>@@ -1,7 +1,7 @@
> extern void printmask(char *name, nodemask_t *mask);
> extern void printcpumask(char *name, unsigned long *mask, int len);
> extern nodemask_t nodemask(char *s);
>-extern unsigned long *cpumask(char *s, int *ncpus);
>+extern unsigned long *cpumask(char *s, int *bufsz);
> extern int read_sysctl(char *name);
> extern void complain(char *fmt, ...);
> extern void nerror(char *fmt, ...);
>diff -up numactl-0.9.8/numactl-0.9.8/util.c.orig numactl-0.9.8/numactl-0.9.8/util.c
>--- numactl-0.9.8/numactl-0.9.8/util.c.orig	2008-04-15 11:52:39.000000000 -0400
>+++ numactl-0.9.8/numactl-0.9.8/util.c	2008-04-15 11:52:45.000000000 -0400
>@@ -83,7 +83,7 @@ unsigned long *cpumask(char *s, int *ncp
> 		arg = strtoul(s, &end, 0); 
> 		if (end == s)
> 			complain("unparseable node description `%s'\n", s);
>-		if (arg >= numcpus)
>+		if (arg > numcpus)
> 			complain("cpu argument %d is out of range\n", arg);
> 		set_bit(arg, cpubuf);
> 		s = end;

Actions: View | Diff

Attachments on bug 442521: 302434 | 302483 | 302581