[PATCH] mask ADT: new nodemask_t implementation [9/22]

[PATCH] mask ADT: new nodemask_t implementation [9/22]

[Paul Jackson]

Patch_9_of_22 - Add new nodemasks.h file.
	Provide a nodemasks_t type, using the mask.h ADT.

diffstat Patch_9_of_22:
 nodemask.h |  146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 146 insertions(+)

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1714  -> 1.1715 
#	               (new)	        -> 1.1     include/linux/nodemask.h
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 04/03/28	pj@sgi.com	1.1715
# The basic definitions of the nodemask_t type, based on the mask ADT.
# --------------------------------------------
#
diff -Nru a/include/linux/nodemask.h b/include/linux/nodemask.h
--- /dev/null	Wed Dec 31 16:00:00 1969
+++ b/include/linux/nodemask.h	Mon Mar 29 01:03:42 2004
@@ -0,0 +1,146 @@
+#ifndef __LINUX_NODEMASK_H
+#define __LINUX_NODEMASK_H
+
+/*
+ * Nodemasks provide a bit mask suitable for representing the
+ * set of Node's in a system, one bit position per Node number.
+ *
+ * See detailed comments in the file linux/mask.h describing the
+ * data type on which these nodemasks are based.
+ *
+ * For details of nodemask_scnprintf() and nodemask_parse(),
+ * see bitmap_scnprintf() and bitmap_parse() in lib/bitmap.c.
+ *
+ * The available nodemask operations are:
+ *
+ * void node_set(node, mask)		turn on bit 'node' in mask
+ * void node_clear(node, mask)		turn off bit 'node' in mask
+ * void nodes_setall(mask)		set all bits
+ * void nodes_clear(mask)		clear all bits
+ * int node_isset(node, mask)		true iff bit 'node' set in mask
+ * int node_test_and_set(node, mask)	test and set bit 'node' in mask
+ *
+ * void nodes_and(dst, src1, src2)	dst = src1 & src2  [intersection]
+ * void nodes_or(dst, src1, src2)	dst = src1 | src2  [union]
+ * void nodes_xor(dst, src1, src2)	dst = src1 ^ src2
+ * void nodes_andnot(dst, src1, src2)	dst = src1 & ~src2
+ * void nodes_complement(dst, src)	dst = ~src
+ *
+ * int nodes_equal(mask1, mask2)	Does mask1 == mask2?
+ * int nodes_intersects(mask1, mask2)	Do mask1 and mask2 intersect?
+ * int nodes_subset(mask1, mask2)	Is mask1 a subset of mask2?
+ * int nodes_empty(mask)		Is mask empty (no bits sets)?
+ * int nodes_full(mask)			Is mask full (all bits sets)?
+ * int nodes_weight(mask)		Hamming weigh - number of set bits
+ *
+ * void nodes_shift_right(dst, src, n)	Shift right
+ * void nodes_shift_left(dst, src, n)	Shift left
+ *
+ * int first_node(mask)			Number lowest set bit, or MAX_NUMNODES
+ * int next_node(node, mask)		Next node past 'node', or MAX_NUMNODES
+ *
+ * nodemask_t nodemask_of_node(node)	Return nodemask with bit 'node' set
+ * NODE_MASK_ALL			Initializer - all bits set
+ * NODE_MASK_NONE			Initializer - no bits set
+ * unsigned long *nodes_raw(mask)	Array of unsigned long's in mask
+ *
+ * int nodemask_scnprintf(buf, len, mask) Format nodemask for printing
+ * int nodemask_parse(ubuf, ulen, mask)	Parse ascii string as nodemask
+ *
+ * int num_online_nodes()		Number of online nodes
+ * int node_online(node)		Is some node < MAX_NUMNODES online?
+ * int node_possible(node)		Is some node < MAX_NUMNODES possible? 
+ * void node_set_online(node)		set node in node_online_map
+ * void node_set_offline(node)		clear node in node_online_map
+ * int any_online_node(mask)		First online node in mask
+ *
+ * for_each_node_mask(node, mask)	for-loop node over mask
+ * for_each_node(node)			for-loop node over node_possible_map
+ * for_each_online_node(node)		for-loop node over node_online_map
+ */
+
+#include <linux/config.h>
+#include <linux/numa.h>
+#include <linux/mask.h>
+#include <linux/threads.h>
+#include <asm/bug.h>
+
+typedef __mask(MAX_NUMNODES) nodemask_t;
+extern nodemask_t _unused_nodemask_arg_;
+
+#define node_set(node, mask) mask_setbit((node), (mask))
+#define node_clear(node, mask) mask_clearbit((node), (mask))
+#define nodes_setall(mask) mask_setall(mask, MAX_NUMNODES)
+#define nodes_clear(mask) mask_clearall(mask)
+#define node_isset(node, mask) mask_isset((node), (mask))
+#define node_test_and_set(node, mask) mask_test_and_set((node), (mask))
+#define nodes_and(dst, src1, src2) mask_and((dst), (src1), (src2))
+#define nodes_or(dst, src1, src2) mask_or((dst), (src1), (src2))
+#define nodes_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
+#define nodes_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
+#define nodes_complement(dst, src) mask_complement((dst), (src), MAX_NUMNODES)
+#define nodes_equal(mask1, mask2) mask_equal((mask1), (mask2))
+#define nodes_intersects(mask1, mask2) mask_intersects(mask1, mask2)
+#define nodes_subset(mask1, mask2) mask_subset(mask1, mask2)
+#define nodes_empty(mask) mask_empty(mask)
+#define nodes_full(mask) mask_full(mask, MAX_NUMNODES)
+#define nodes_weight(mask) mask_weight(mask, MAX_NUMNODES)
+#define nodes_shift_right(dst, src, n) \
+			mask_shift_right((dst), (src), (n), MAX_NUMNODES)
+#define nodes_shift_left(dst, src, n) \
+			mask_shift_left((dst), (src), (n), MAX_NUMNODES)
+#define first_node(mask) mask_first(mask, MAX_NUMNODES)
+#define next_node(node, mask) mask_next(node, mask, MAX_NUMNODES)
+#define nodemask_of_node(node) mask_of_bit((node), _unused_nodemask_arg_)
+#define NODE_MASK_ALL MASK_ALL(MAX_NUMNODES)
+#define NODE_MASK_NONE MASK_NONE(MAX_NUMNODES)
+#define nodes_raw(mask) mask_raw(mask)
+#define nodemask_scnprintf(buf, len, mask) \
+			mask_scnprintf(buf, len, mask, MAX_NUMNODES)
+#define nodemask_parse(ubuf, ulen, mask) \
+			mask_parse(ubuf, ulen, mask, MAX_NUMNODES)
+
+/*
+ * The following particular system nodemasks and operations
+ * on them manage all (possible) and online nodes.
+ */
+
+extern nodemask_t node_online_map;
+extern nodemask_t node_possible_map;
+
+#ifdef CONFIG_NUMA
+
+#define num_online_nodes()		nodes_weight(node_online_map)
+#define node_online(node)		node_isset(node, node_online_map)
+#define node_possible(node) 		node_isset(node, node_possible_map)
+#define node_set_online(node)		node_set(node, node_online_map)
+#define node_set_offline(node)		node_clear(node, node_online_map)
+
+#define for_each_node_mask(node, mask)		\
+	for (node = first_node(mask);		\
+		node < MAX_NUMNODES;		\
+		node = next_node(node, mask))
+
+#else /* !CONFIG_NUMA */
+
+#define num_online_nodes()		1
+#define node_online(node)		({ BUG_ON((node) != 0); 1; })
+#define node_possible(node)		({ BUG_ON((node) != 0); 1; })
+#define node_set_online(node)		({ BUG_ON((node) != 0); })
+#define node_set_offline(node)		({ BUG(); })
+
+#define for_each_node_mask(node, mask)	for (node = 0; node < 1; node++)
+
+#endif /* CONFIG_NUMA */
+
+#define for_each_node(node) for_each_node_mask(node, node_possible_map)
+#define for_each_online_node(node) for_each_node_mask(node, node_online_map)
+
+#define any_online_node(mask)			\
+({						\
+        nodemask_t n;				\
+        nodes_and(n, mask, node_online_map);	\
+        first_node(n);				\
+})
+
+#endif /* __LINUX_NODEMASK_H */


-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

Re: [PATCH] mask ADT: new nodemask_t implementation [9/22]

[Matthew Dobson]

[-- Attachment #1: Type: text/plain, Size: 897 bytes --]

On Mon, 2004-03-29 at 04:13, Paul Jackson wrote:
> Patch_9_of_22 - Add new nodemasks.h file.
> 	Provide a nodemasks_t type, using the mask.h ADT.

Paul,
	Some changes to include/linux/nodemask.h:

1) You didn't provide a num_possible_nodes() macro.

2) Dropped #include <linux/config.h>.  The very next include
(linux/numa.h) includes this file.

3) Dropped #include <linux/threads.h>.  Nothing in this file appeared to
be using anything from that file.

4) Indented all the node_* and nodes_* macros.  Massively more readable.

5) Made sure any macro call with more than 1 argument had its arguments
wrapped in parens.  It seemed like you were a bit inconsistent as to
whether or not the arguments to macros got parens.

6) Moved any_online_node() definition inside the #ifdef CONFIG_NUMA. 
There is an easy version of this macro for non-NUMA.  Plus it matches up
with cpumask.h.

Cheers!

-Matt

[-- Attachment #2: nodemask_h-mcd.patch --]
[-- Type: text/x-patch, Size: 6479 bytes --]

diff -Nurp --exclude-from=/home/mcd/.dontdiff linux-2.6.4-pj_nodemask/include/linux/nodemask.h linux-2.6.4-nodemask_h-mcd/include/linux/nodemask.h
--- linux-2.6.4-pj_nodemask/include/linux/nodemask.h	Tue Mar 30 17:04:27 2004
+++ linux-2.6.4-nodemask_h-mcd/include/linux/nodemask.h	Wed Mar 31 16:21:56 2004
@@ -48,6 +48,7 @@
  * int nodemask_parse(ubuf, ulen, mask)	Parse ascii string as nodemask
  *
  * int num_online_nodes()		Number of online nodes
+ * int num_possible_nodes()		Number of all possible nodes
  * int node_online(node)		Is some node < MAX_NUMNODES online?
  * int node_possible(node)		Is some node < MAX_NUMNODES possible? 
  * void node_set_online(node)		set node in node_online_map
@@ -59,46 +60,44 @@
  * for_each_online_node(node)		for-loop node over node_online_map
  */
 
-#include <linux/config.h>
 #include <linux/numa.h>
 #include <linux/mask.h>
-#include <linux/threads.h>
 #include <asm/bug.h>
 
 typedef __mask(MAX_NUMNODES) nodemask_t;
 extern nodemask_t _unused_nodemask_arg_;
 
-#define node_set(node, mask) mask_setbit((node), (mask))
-#define node_clear(node, mask) mask_clearbit((node), (mask))
-#define nodes_setall(mask) mask_setall(mask, MAX_NUMNODES)
-#define nodes_clear(mask) mask_clearall(mask)
-#define node_isset(node, mask) mask_isset((node), (mask))
-#define node_test_and_set(node, mask) mask_test_and_set((node), (mask))
-#define nodes_and(dst, src1, src2) mask_and((dst), (src1), (src2))
-#define nodes_or(dst, src1, src2) mask_or((dst), (src1), (src2))
-#define nodes_xor(dst, src1, src2) mask_xor((dst), (src1), (src2))
-#define nodes_andnot(dst, src1, src2) mask_andnot((dst), (src1), (src2))
-#define nodes_complement(dst, src) mask_complement((dst), (src), MAX_NUMNODES)
-#define nodes_equal(mask1, mask2) mask_equal((mask1), (mask2))
-#define nodes_intersects(mask1, mask2) mask_intersects(mask1, mask2)
-#define nodes_subset(mask1, mask2) mask_subset(mask1, mask2)
-#define nodes_empty(mask) mask_empty(mask)
-#define nodes_full(mask) mask_full(mask, MAX_NUMNODES)
-#define nodes_weight(mask) mask_weight(mask, MAX_NUMNODES)
-#define nodes_shift_right(dst, src, n) \
+#define node_set(node, mask)		mask_setbit((node), (mask))
+#define node_clear(node, mask)		mask_clearbit((node), (mask))
+#define nodes_setall(mask)		mask_setall((mask), MAX_NUMNODES)
+#define nodes_clear(mask)		mask_clearall(mask)
+#define node_isset(node, mask)		mask_isset((node), (mask))
+#define node_test_and_set(node, mask)	mask_test_and_set((node), (mask))
+#define nodes_and(dst, src1, src2)	mask_and((dst), (src1), (src2))
+#define nodes_or(dst, src1, src2)	mask_or((dst), (src1), (src2))
+#define nodes_xor(dst, src1, src2)	mask_xor((dst), (src1), (src2))
+#define nodes_andnot(dst, src1, src2)	mask_andnot((dst), (src1), (src2))
+#define nodes_complement(dst, src)	mask_complement((dst), (src), MAX_NUMNODES)
+#define nodes_equal(mask1, mask2)	mask_equal((mask1), (mask2))
+#define nodes_intersects(mask1, mask2)	mask_intersects((mask1), (mask2))
+#define nodes_subset(mask1, mask2)	mask_subset((mask1), (mask2))
+#define nodes_empty(mask)		mask_empty(mask)
+#define nodes_full(mask)		mask_full((mask), MAX_NUMNODES)
+#define nodes_weight(mask)		mask_weight((mask), MAX_NUMNODES)
+#define nodes_shift_right(dst, src, n)	\
 			mask_shift_right((dst), (src), (n), MAX_NUMNODES)
-#define nodes_shift_left(dst, src, n) \
+#define nodes_shift_left(dst, src, n)	\
 			mask_shift_left((dst), (src), (n), MAX_NUMNODES)
-#define first_node(mask) mask_first(mask, MAX_NUMNODES)
-#define next_node(node, mask) mask_next(node, mask, MAX_NUMNODES)
-#define nodemask_of_node(node) mask_of_bit((node), _unused_nodemask_arg_)
-#define NODE_MASK_ALL MASK_ALL(MAX_NUMNODES)
-#define NODE_MASK_NONE MASK_NONE(MAX_NUMNODES)
-#define nodes_raw(mask) mask_raw(mask)
+#define first_node(mask)		mask_first((mask), MAX_NUMNODES)
+#define next_node(node, mask)		mask_next((node), (mask), MAX_NUMNODES)
+#define nodemask_of_node(node)		mask_of_bit((node), _unused_nodemask_arg_)
+#define NODE_MASK_ALL			MASK_ALL(MAX_NUMNODES)
+#define NODE_MASK_NONE			MASK_NONE(MAX_NUMNODES)
+#define nodes_raw(mask)			mask_raw(mask)
 #define nodemask_scnprintf(buf, len, mask) \
-			mask_scnprintf(buf, len, mask, MAX_NUMNODES)
+			mask_scnprintf((buf), (len), (mask), MAX_NUMNODES)
 #define nodemask_parse(ubuf, ulen, mask) \
-			mask_parse(ubuf, ulen, mask, MAX_NUMNODES)
+			mask_parse((ubuf), (ulen), (mask), MAX_NUMNODES)
 
 /*
  * The following particular system nodemasks and operations
@@ -111,10 +110,18 @@ extern nodemask_t node_possible_map;
 #ifdef CONFIG_NUMA
 
 #define num_online_nodes()		nodes_weight(node_online_map)
-#define node_online(node)		node_isset(node, node_online_map)
-#define node_possible(node) 		node_isset(node, node_possible_map)
-#define node_set_online(node)		node_set(node, node_online_map)
-#define node_set_offline(node)		node_clear(node, node_online_map)
+#define num_possible_nodes()		nodes_weight(node_possible_map)
+#define node_online(node)		node_isset((node), node_online_map)
+#define node_possible(node) 		node_isset((node), node_possible_map)
+#define node_set_online(node)		node_set((node), node_online_map)
+#define node_set_offline(node)		node_clear((node), node_online_map)
+
+#define any_online_node(mask)			\
+({						\
+        nodemask_t n;				\
+        nodes_and(n, mask, node_online_map);	\
+        first_node(n);				\
+})
 
 #define for_each_node_mask(node, mask)		\
 	for (node = first_node(mask);		\
@@ -124,23 +131,21 @@ extern nodemask_t node_possible_map;
 #else /* !CONFIG_NUMA */
 
 #define num_online_nodes()		1
+#define num_possible_nodes()		1
 #define node_online(node)		({ BUG_ON((node) != 0); 1; })
 #define node_possible(node)		({ BUG_ON((node) != 0); 1; })
 #define node_set_online(node)		({ BUG_ON((node) != 0); })
 #define node_set_offline(node)		({ BUG(); })
 
+#define any_online_node(mask)		0
+
 #define for_each_node_mask(node, mask)	for (node = 0; node < 1; node++)
 
 #endif /* CONFIG_NUMA */
 
-#define for_each_node(node) for_each_node_mask(node, node_possible_map)
-#define for_each_online_node(node) for_each_node_mask(node, node_online_map)
-
-#define any_online_node(mask)			\
-({						\
-        nodemask_t n;				\
-        nodes_and(n, mask, node_online_map);	\
-        first_node(n);				\
-})
+#define for_each_node(node)		\
+			for_each_node_mask(node, node_possible_map)
+#define for_each_online_node(node)	\
+			for_each_node_mask(node, node_online_map)
 
 #endif /* __LINUX_NODEMASK_H */