API: reorder membind support bits

We're breaking the ABI in 3.0 so let's reorder
these bits in a more logical manner.

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

hwloc/topology-xml.c

@@ -1081,16 +1081,16 @@ hwloc__xml_import_support(hwloc_topology_t topology,
     else DO(membind,get_proc_membind);
     else DO(membind,set_thisthread_membind);
     else DO(membind,get_thisthread_membind);
+    else DO(membind,alloc_membind);
     else DO(membind,set_area_membind);
     else DO(membind,get_area_membind);
-    else DO(membind,alloc_membind);
+    else DO(membind,get_area_memlocation);
     else DO(membind,firsttouch_membind);
     else DO(membind,bind_membind);
     else DO(membind,interleave_membind);
     else DO(membind,weighted_interleave_membind);
     else DO(membind,nexttouch_membind);
     else DO(membind,migrate_membind);
-    else DO(membind,get_area_memlocation);
 
     else if (!strcmp("custom.exported_support", name))
       /* support was exported in a custom/fake field, mark it as imported here */
@@ -2510,16 +2510,16 @@ hwloc__xml_v2export_support(hwloc__xml_export_state_t parentstate, hwloc_topolog
   DO(membind,get_proc_membind);
   DO(membind,set_thisthread_membind);
   DO(membind,get_thisthread_membind);
+  DO(membind,alloc_membind);
   DO(membind,set_area_membind);
   DO(membind,get_area_membind);
-  DO(membind,alloc_membind);
+  DO(membind,get_area_memlocation);
   DO(membind,firsttouch_membind);
   DO(membind,bind_membind);
   DO(membind,interleave_membind);
   DO(membind,weighted_interleave_membind);
   DO(membind,nexttouch_membind);
   DO(membind,migrate_membind);
-  DO(membind,get_area_memlocation);
 
   /* misc.imported_support would be meaningless in the remote importer,
    * but the importer needs to know whether we exported support or not

include/hwloc.h

@@ -2508,26 +2508,28 @@ struct hwloc_topology_membind_support {
   unsigned char set_thisthread_membind;
   /** Getting the binding of the current thread only is supported.  */
   unsigned char get_thisthread_membind;
+
+  /** Allocating a bound memory area is supported. */
+  unsigned char alloc_membind;
   /** Binding a given memory area is supported. */
   unsigned char set_area_membind;
   /** Getting the binding of a given memory area is supported.  */
   unsigned char get_area_membind;
-  /** Allocating a bound memory area is supported. */
-  unsigned char alloc_membind;
+  /** Getting the last NUMA nodes where a memory area was allocated is supported */
+  unsigned char get_area_memlocation;
+
   /** First-touch policy is supported. */
   unsigned char firsttouch_membind;
   /** Bind policy is supported. */
   unsigned char bind_membind;
   /** Interleave policy is supported. */
   unsigned char interleave_membind;
+  /** Weighted interleave policy is supported. */
+  unsigned char weighted_interleave_membind;
   /** Next-touch migration policy is supported. */
   unsigned char nexttouch_membind;
   /** Migration flags is supported. */
   unsigned char migrate_membind;
-  /** Getting the last NUMA nodes where a memory area was allocated is supported */
-  unsigned char get_area_memlocation;
-  /** Weighted interleave policy is supported. */
-  unsigned char weighted_interleave_membind;
 };
 
 /** \brief Flags describing miscellaneous features.

utils/hwloc/hwloc-info.c

@@ -748,16 +748,16 @@ hwloc_info_show_support(hwloc_topology_t topology)
   DO(membind, get_proc_membind);
   DO(membind, set_thisthread_membind);
   DO(membind, get_thisthread_membind);
+  DO(membind, alloc_membind);
   DO(membind, set_area_membind);
   DO(membind, get_area_membind);
-  DO(membind, alloc_membind);
+  DO(membind, get_area_memlocation);
   DO(membind, firsttouch_membind);
   DO(membind, bind_membind);
   DO(membind, interleave_membind);
   DO(membind, weighted_interleave_membind);
   DO(membind, nexttouch_membind);
   DO(membind, migrate_membind);
-  DO(membind, get_area_memlocation);
 
   DO(misc, imported_support);
 #undef DO