diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-02-19 14:30:50 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-02-20 14:44:38 +1100 |
| commit | 7f727e5d328d2aa07dc09de4428dda3a153ad90b (patch) | |
| tree | fa0b8ec592e86d9b6d9998f8023201b26283accf /ctdb/client | |
| parent | dab2f6817ddcb2e18f6f1b406b8485649b1857d8 (diff) | |
| download | samba-7f727e5d328d2aa07dc09de4428dda3a153ad90b.tar.gz samba-7f727e5d328d2aa07dc09de4428dda3a153ad90b.tar.xz samba-7f727e5d328d2aa07dc09de4428dda3a153ad90b.zip | |
client: Refactor node listing functions to use list_of_nodes()
This reduces repetition.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Pair-programmed-with: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit f505020a5720faa4ecc6414e0bfaa6b3c0e47291)
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 86 |
1 files changed, 5 insertions, 81 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 74bfb59a77c..d2cf0f69e34 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -3494,33 +3494,8 @@ uint32_t *list_of_active_nodes(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, bool include_self) { - int i, j, num_nodes; - uint32_t *nodes; - - for (i=num_nodes=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_INACTIVE) { - continue; - } - if (node_map->nodes[i].pnn == ctdb->pnn && !include_self) { - continue; - } - num_nodes++; - } - - nodes = talloc_array(mem_ctx, uint32_t, num_nodes); - CTDB_NO_MEMORY_FATAL(ctdb, nodes); - - for (i=j=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_INACTIVE) { - continue; - } - if (node_map->nodes[i].pnn == ctdb->pnn && !include_self) { - continue; - } - nodes[j++] = node_map->nodes[i].pnn; - } - - return nodes; + return list_of_nodes(ctdb, node_map, mem_ctx, NODE_FLAGS_INACTIVE, + include_self ? -1 : ctdb->pnn); } uint32_t *list_of_active_nodes_except_pnn(struct ctdb_context *ctdb, @@ -3528,33 +3503,7 @@ uint32_t *list_of_active_nodes_except_pnn(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, uint32_t pnn) { - int i, j, num_nodes; - uint32_t *nodes; - - for (i=num_nodes=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_INACTIVE) { - continue; - } - if (node_map->nodes[i].pnn == pnn) { - continue; - } - num_nodes++; - } - - nodes = talloc_array(mem_ctx, uint32_t, num_nodes); - CTDB_NO_MEMORY_FATAL(ctdb, nodes); - - for (i=j=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_INACTIVE) { - continue; - } - if (node_map->nodes[i].pnn == pnn) { - continue; - } - nodes[j++] = node_map->nodes[i].pnn; - } - - return nodes; + return list_of_nodes(ctdb, node_map, mem_ctx, NODE_FLAGS_INACTIVE, pnn); } uint32_t *list_of_connected_nodes(struct ctdb_context *ctdb, @@ -3562,33 +3511,8 @@ uint32_t *list_of_connected_nodes(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx, bool include_self) { - int i, j, num_nodes; - uint32_t *nodes; - - for (i=num_nodes=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_DISCONNECTED) { - continue; - } - if (node_map->nodes[i].pnn == ctdb->pnn && !include_self) { - continue; - } - num_nodes++; - } - - nodes = talloc_array(mem_ctx, uint32_t, num_nodes); - CTDB_NO_MEMORY_FATAL(ctdb, nodes); - - for (i=j=0;i<node_map->num;i++) { - if (node_map->nodes[i].flags & NODE_FLAGS_DISCONNECTED) { - continue; - } - if (node_map->nodes[i].pnn == ctdb->pnn && !include_self) { - continue; - } - nodes[j++] = node_map->nodes[i].pnn; - } - - return nodes; + return list_of_nodes(ctdb, node_map, mem_ctx, NODE_FLAGS_DISCONNECTED, + include_self ? -1 : ctdb->pnn); } /* |