sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

there are now far too many controls for the controls statistics fields to be useful

Browse Source 
(This used to be ctdb commit f5e188fc7e13b55b6b4081dcc74ea9614a76f9bb)
This commit is contained in:
Andrew Tridgell 2007-06-07 18:07:38 +10:00
parent 3e4d7bef23
commit 96861466b7
3 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ctdb/common/ctdb_control.c
View File

@ -52,7 +52,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
switch (opcode) {
case CTDB_CONTROL_PROCESS_EXISTS: {
CHECK_CONTROL_DATA_SIZE(sizeof(pid_t));
ctdb->statistics.controls.process_exists++;
return kill(*(pid_t *)indata.dptr, 0);
}
@ -71,7 +70,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
case CTDB_CONTROL_STATISTICS: {
CHECK_CONTROL_DATA_SIZE(0);
ctdb->statistics.controls.statistics++;
ctdb->statistics.memory_used = talloc_total_size(ctdb);
ctdb->statistics.frozen = (ctdb->freeze_mode == CTDB_FREEZE_FROZEN);
ctdb->statistics.recovering = (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE);
@ -147,7 +145,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
case CTDB_CONTROL_PING:
CHECK_CONTROL_DATA_SIZE(0);
ctdb->statistics.controls.ping++;
return ctdb->statistics.num_clients;
case CTDB_CONTROL_GET_DBNAME: {
@ -177,45 +174,36 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
}
case CTDB_CONTROL_DB_ATTACH:
ctdb->statistics.controls.attach++;
return ctdb_control_db_attach(ctdb, indata, outdata);
case CTDB_CONTROL_SET_CALL: {
struct ctdb_control_set_call *sc =
(struct ctdb_control_set_call *)indata.dptr;
ctdb->statistics.controls.set_call++;
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_set_call));
return ctdb_daemon_set_call(ctdb, sc->db_id, sc->fn, sc->id);
}
case CTDB_CONTROL_TRAVERSE_START:
CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
ctdb->statistics.controls.traverse_start++;
return ctdb_control_traverse_start(ctdb, indata, outdata, srcnode);
case CTDB_CONTROL_TRAVERSE_ALL:
ctdb->statistics.controls.traverse_all++;
return ctdb_control_traverse_all(ctdb, indata, outdata);
case CTDB_CONTROL_TRAVERSE_DATA:
ctdb->statistics.controls.traverse_data++;
return ctdb_control_traverse_data(ctdb, indata, outdata);
case CTDB_CONTROL_REGISTER_SRVID:
ctdb->statistics.controls.register_srvid++;
return daemon_register_message_handler(ctdb, client_id, srvid);
case CTDB_CONTROL_DEREGISTER_SRVID:
ctdb->statistics.controls.deregister_srvid++;
return daemon_deregister_message_handler(ctdb, client_id, srvid);
case CTDB_CONTROL_ENABLE_SEQNUM:
ctdb->statistics.controls.enable_seqnum++;
CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));
return ctdb_ltdb_enable_seqnum(ctdb, *(uint32_t *)indata.dptr);
case CTDB_CONTROL_UPDATE_SEQNUM:
ctdb->statistics.controls.update_seqnum++;
CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));
return ctdb_ltdb_update_seqnum(ctdb, *(uint32_t *)indata.dptr, srcnode);

16
ctdb/include/ctdb_private.h
View File

@ -210,22 +210,6 @@ struct ctdb_statistics {
uint32_t req_message;
uint32_t req_control;
} client;
struct {
uint32_t statistics;
uint32_t get_config;
uint32_t ping;
uint32_t attach;
uint32_t set_call;
uint32_t process_exists;
uint32_t traverse_start;
uint32_t traverse_all;
uint32_t traverse_data;
uint32_t update_seqnum;
uint32_t enable_seqnum;
uint32_t set_seqnum_frequency;
uint32_t register_srvid;
uint32_t deregister_srvid;
} controls;
struct {
uint32_t call;
uint32_t control;

13
ctdb/tools/ctdb_control.c
View File

@ -96,19 +96,6 @@ static void show_statistics(struct ctdb_statistics *s)
STATISTICS_FIELD(client.req_call),
STATISTICS_FIELD(client.req_message),
STATISTICS_FIELD(client.req_control),
STATISTICS_FIELD(controls.statistics),
STATISTICS_FIELD(controls.get_config),
STATISTICS_FIELD(controls.ping),
STATISTICS_FIELD(controls.attach),
STATISTICS_FIELD(controls.set_call),
STATISTICS_FIELD(controls.process_exists),
STATISTICS_FIELD(controls.traverse_start),
STATISTICS_FIELD(controls.traverse_all),
STATISTICS_FIELD(controls.traverse_data),
STATISTICS_FIELD(controls.update_seqnum),
STATISTICS_FIELD(controls.enable_seqnum),
STATISTICS_FIELD(controls.register_srvid),
STATISTICS_FIELD(controls.deregister_srvid),
STATISTICS_FIELD(timeouts.call),
STATISTICS_FIELD(timeouts.control),
STATISTICS_FIELD(timeouts.traverse),