------------------------------------------------------------ revno: 255 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Andrew Tridgell <[EMAIL PROTECTED]> branch nick: tridge timestamp: Sat 2007-05-05 14:09:46 +1000 message: show number of connected clients in status output modified: common/ctdb_control.c ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1 common/ctdb_daemon.c ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1 include/ctdb_private.h ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13 tools/ctdb_control.c ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1 === modified file 'common/ctdb_control.c' --- a/common/ctdb_control.c 2007-05-05 01:03:10 +0000 +++ b/common/ctdb_control.c 2007-05-05 04:09:46 +0000 @@ -359,7 +359,7 @@ case CTDB_CONTROL_PING: CHECK_CONTROL_DATA_SIZE(0); ctdb->status.controls.ping++; - return ctdb->num_clients; + return ctdb->status.num_clients; case CTDB_CONTROL_GET_DBNAME: { uint32_t db_id;
=== modified file 'common/ctdb_daemon.c' --- a/common/ctdb_daemon.c 2007-05-04 01:41:29 +0000 +++ b/common/ctdb_daemon.c 2007-05-05 04:09:46 +0000 @@ -248,7 +248,7 @@ static int ctdb_client_destructor(struct ctdb_client *client) { ctdb_reqid_remove(client->ctdb, client->client_id); - client->ctdb->num_clients--; + client->ctdb->status.num_clients--; close(client->fd); client->fd = -1; return 0; @@ -559,7 +559,7 @@ client->ctdb = ctdb; client->fd = fd; client->client_id = ctdb_reqid_new(ctdb, client); - ctdb->num_clients++; + ctdb->status.num_clients++; client->queue = ctdb_queue_setup(ctdb, client, fd, CTDB_DS_ALIGNMENT, ctdb_daemon_read_cb, client); === modified file 'include/ctdb_private.h' --- a/include/ctdb_private.h 2007-05-05 01:03:10 +0000 +++ b/include/ctdb_private.h 2007-05-05 04:09:46 +0000 @@ -131,6 +131,7 @@ ctdb status information */ struct ctdb_status { + uint32_t num_clients; uint32_t client_packets_sent; uint32_t client_packets_recv; uint32_t node_packets_sent; === modified file 'tools/ctdb_control.c' --- a/tools/ctdb_control.c 2007-05-05 01:03:10 +0000 +++ b/tools/ctdb_control.c 2007-05-05 04:09:46 +0000 @@ -97,6 +97,7 @@ uint32_t offset; } fields[] = { #define STATUS_FIELD(n) { #n, offsetof(struct ctdb_status, n) } + STATUS_FIELD(num_clients), STATUS_FIELD(client_packets_sent), STATUS_FIELD(client_packets_recv), STATUS_FIELD(node_packets_sent),