Makefile.am: Clean flake8-check too.

[cascardo/ovs.git] / lib / ovs-numa.h

diff --git a/lib/ovs-numa.h b/lib/ovs-numa.h
index 95884c5..1435d3d 100644 (file)
--- a/lib/ovs-numa.h
+++ b/lib/ovs-numa.h
@@ -21,23 +21,44 @@
 #include <stdbool.h>
 
 #include "compiler.h"
+#include "list.h"
 
 #define OVS_CORE_UNSPEC INT_MAX
-#define OVS_SOCKET_UNSPEC INT_MAX
+#define OVS_NUMA_UNSPEC INT_MAX
+
+/* Dump of a list of 'struct ovs_numa_info'. */
+struct ovs_numa_dump {
+    struct ovs_list dump;
+};
+
+/* A numa_id - core_id pair. */
+struct ovs_numa_info {
+    struct ovs_list list_node;
+    int numa_id;
+    unsigned core_id;
+};
 
 #ifdef __linux__
 
 void ovs_numa_init(void);
-bool ovs_numa_cpu_socket_id_is_valid(int sid);
-bool ovs_numa_cpu_core_id_is_valid(int cid);
-int ovs_numa_get_n_sockets(void);
+bool ovs_numa_numa_id_is_valid(int numa_id);
+bool ovs_numa_core_id_is_valid(unsigned core_id);
+bool ovs_numa_core_is_pinned(unsigned core_id);
+int ovs_numa_get_n_numas(void);
+void ovs_numa_set_cpu_mask(const char *cmask);
 int ovs_numa_get_n_cores(void);
-int ovs_numa_get_n_cores_on_socket(int socket_id);
-int ovs_numa_get_n_unpinned_cores_on_socket(int socket_id);
-bool ovs_numa_try_pin_core_specific(int core_id);
-int ovs_numa_get_unpinned_core_any(void);
-int ovs_numa_get_unpinned_core_on_socket(int socket_id);
-void ovs_numa_unpin_core(int core_id);
+int ovs_numa_get_numa_id(unsigned core_id);
+int ovs_numa_get_n_cores_on_numa(int numa_id);
+int ovs_numa_get_n_unpinned_cores_on_numa(int numa_id);
+bool ovs_numa_try_pin_core_specific(unsigned core_id);
+unsigned ovs_numa_get_unpinned_core_any(void);
+unsigned ovs_numa_get_unpinned_core_on_numa(int numa_id);
+void ovs_numa_unpin_core(unsigned core_id);
+struct ovs_numa_dump *ovs_numa_dump_cores_on_numa(int numa_id);
+void ovs_numa_dump_destroy(struct ovs_numa_dump *);
+
+#define FOR_EACH_CORE_ON_NUMA(ITER, DUMP)                    \
+    LIST_FOR_EACH((ITER), list_node, &(DUMP)->dump)
 
 #else
 
@@ -48,21 +69,33 @@ ovs_numa_init(void)
 }
 
 static inline bool
-ovs_numa_cpu_socket_id_is_valid(int sid OVS_UNUSED)
+ovs_numa_numa_id_is_valid(int numa_id OVS_UNUSED)
+{
+    return false;
+}
+
+static inline bool
+ovs_numa_core_id_is_valid(unsigned core_id OVS_UNUSED)
 {
     return false;
 }
 
 static inline bool
-ovs_numa_cpu_core_id_is_valid(int cid OVS_UNUSED)
+ovs_numa_core_is_pinned(unsigned core_id OVS_UNUSED)
 {
     return false;
 }
 
+static inline void
+ovs_numa_set_cpu_mask(const char *cmask OVS_UNUSED)
+{
+    /* Nothing */
+}
+
 static inline int
-ovs_numa_get_n_sockets(void)
+ovs_numa_get_n_numas(void)
 {
-    return OVS_SOCKET_UNSPEC;
+    return OVS_NUMA_UNSPEC;
 }
 
 static inline int
@@ -72,40 +105,62 @@ ovs_numa_get_n_cores(void)
 }
 
 static inline int
-ovs_numa_get_n_cores_on_socket(int socket_id OVS_UNUSED)
+ovs_numa_get_numa_id(unsigned core_id OVS_UNUSED)
+{
+    return OVS_NUMA_UNSPEC;
+}
+
+static inline int
+ovs_numa_get_n_cores_on_numa(int numa_id OVS_UNUSED)
 {
     return OVS_CORE_UNSPEC;
 }
 
 static inline int
-ovs_numa_get_n_unpinned_cores_on_socket(int socket_id OVS_UNUSED)
+ovs_numa_get_n_unpinned_cores_on_numa(int numa_id OVS_UNUSED)
 {
     return OVS_CORE_UNSPEC;
 }
 
 static inline bool
-ovs_numa_try_pin_core_specific(int core_id OVS_UNUSED)
+ovs_numa_try_pin_core_specific(unsigned core_id OVS_UNUSED)
 {
     return false;
 }
 
-static inline int
+static inline unsigned
 ovs_numa_get_unpinned_core_any(void)
 {
     return OVS_CORE_UNSPEC;
 }
 
-static inline int
-ovs_numa_get_unpinned_core_on_socket(int socket_id OVS_UNUSED)
+static inline unsigned
+ovs_numa_get_unpinned_core_on_numa(int numa_id OVS_UNUSED)
 {
     return OVS_CORE_UNSPEC;
 }
 
 static inline void
-ovs_numa_unpin_core(int core_id OVS_UNUSED)
+ovs_numa_unpin_core(unsigned core_id OVS_UNUSED)
 {
     /* Nothing */
 }
 
+static inline struct ovs_numa_dump *
+ovs_numa_dump_cores_on_numa(int numa_id OVS_UNUSED)
+{
+    return NULL;
+}
+
+static inline void
+ovs_numa_dump_destroy(struct ovs_numa_dump *dump OVS_UNUSED)
+{
+    /* Nothing */
+}
+
+/* No loop. */
+#define FOR_EACH_CORE_ON_NUMA(ITER, DUMP)                    \
+    for ((ITER) = NULL; (ITER);)
+
 #endif /* __linux__ */
 #endif /* ovs-thead.h */