dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved the MS/TP statistics gathering and display.

Browse Source
This commit is contained in:
skarg
2009-07-28 15:17:48 +00:00
parent c782578f9f
commit 502a25ba91
1 changed files with 59 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/demo/mstpcap/main.c
+54 -42
View File
@@ -72,14 +72,13 @@ struct mstp_statistics
/* highest number MAC during poll for master */ /* highest number MAC during poll for master */
uint8_t max_master; uint8_t max_master;
/* how long it takes a node to pass the token */ /* how long it takes a node to pass the token */
uint32_t token_reply_min; uint32_t token_reply;
uint32_t token_reply_max;
/* how long it takes a node to reply to PFM */ /* how long it takes a node to reply to PFM */
uint32_t pfm_reply_min; uint32_t pfm_reply;
uint32_t pfm_reply_max;
/* how long it takes a node to reply to DER */ /* how long it takes a node to reply to DER */
uint32_t der_reply_min; uint32_t der_reply;
uint32_t der_reply_max; /* how long it takes a node to send a reply post poned */
uint32_t reply_postponed;
}; };
static struct mstp_statistics MSTP_Statistics[256]; static struct mstp_statistics MSTP_Statistics[256];
@@ -114,23 +113,23 @@ static void packet_statistics(
switch (frame) { switch (frame) {
case FRAME_TYPE_TOKEN: case FRAME_TYPE_TOKEN:
MSTP_Statistics[src].token_count++; MSTP_Statistics[src].token_count++;
if ((old_frame == frame) && (old_dst == dst)) { if (old_frame == FRAME_TYPE_TOKEN) {
if (old_dst == dst) {
/* repeated token */ /* repeated token */
MSTP_Statistics[dst].token_retries++; MSTP_Statistics[dst].token_retries++;
} } else if (old_dst == src) {
if (old_frame == frame) {
/* token to token response time */ /* token to token response time */
delta = timeval_diff_ms(&old_tv, tv); delta = timeval_diff_ms(&old_tv, tv);
if (delta) { if (delta > MSTP_Statistics[src].token_reply) {
/* only count times that are non-zero */ MSTP_Statistics[src].token_reply = delta;
if (MSTP_Statistics[src].token_reply_min == 0) {
MSTP_Statistics[src].token_reply_min = delta;
} else if (delta < MSTP_Statistics[src].token_reply_min) {
MSTP_Statistics[src].token_reply_min = delta;
} }
if (delta > MSTP_Statistics[src].token_reply_max) {
MSTP_Statistics[src].token_reply_max = delta;
} }
} else if ((old_frame == FRAME_TYPE_POLL_FOR_MASTER) &&
(old_src == src)) {
/* Tusage_timeout */
delta = timeval_diff_ms(&old_tv, tv);
if (delta > MSTP_Statistics[src].tusage_timeout) {
MSTP_Statistics[src].tusage_timeout = delta;
} }
} }
break; break;
@@ -142,15 +141,8 @@ static void packet_statistics(
case FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER: case FRAME_TYPE_REPLY_TO_POLL_FOR_MASTER:
if (old_frame == FRAME_TYPE_POLL_FOR_MASTER) { if (old_frame == FRAME_TYPE_POLL_FOR_MASTER) {
delta = timeval_diff_ms(&old_tv, tv); delta = timeval_diff_ms(&old_tv, tv);
if (delta) { if (delta > MSTP_Statistics[src].pfm_reply) {
if (MSTP_Statistics[src].pfm_reply_min == 0) { MSTP_Statistics[src].pfm_reply = delta;
MSTP_Statistics[src].pfm_reply_min = delta;
} else if (delta < MSTP_Statistics[src].pfm_reply_min) {
MSTP_Statistics[src].pfm_reply_min = delta;
}
if (delta > MSTP_Statistics[src].pfm_reply_max) {
MSTP_Statistics[src].pfm_reply_max = delta;
}
} }
} }
break; break;
@@ -161,8 +153,24 @@ static void packet_statistics(
case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY:
break; break;
case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY: case FRAME_TYPE_BACNET_DATA_NOT_EXPECTING_REPLY:
if ((old_frame == FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY) &&
(old_dst == src)) {
/* DER response time */
delta = timeval_diff_ms(&old_tv, tv);
if (delta > MSTP_Statistics[src].der_reply) {
MSTP_Statistics[src].der_reply = delta;
}
}
break; break;
case FRAME_TYPE_REPLY_POSTPONED: case FRAME_TYPE_REPLY_POSTPONED:
if ((old_frame == FRAME_TYPE_BACNET_DATA_EXPECTING_REPLY) &&
(old_dst == src)) {
/* Postponed response time */
delta = timeval_diff_ms(&old_tv, tv);
if (delta > MSTP_Statistics[src].reply_postponed) {
MSTP_Statistics[src].reply_postponed = delta;
}
}
break; break;
default: default:
break; break;
@@ -180,21 +188,27 @@ static void packet_statistics_save(void)
{ {
unsigned i; /* loop counter */ unsigned i; /* loop counter */
fprintf(stdout, "\r\n");
/* separate with tabs (8) keep words under 8 characters */
fprintf(stdout,
"MAC\tMaxMstr\tTokens\tRetries\tTusage"
"\tTreply\tTrpfm\tTder\tTpostpd");
fprintf(stdout, "\r\n"); fprintf(stdout, "\r\n");
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
if (MSTP_Statistics[i].token_count) { if (MSTP_Statistics[i].token_count) {
fprintf(stdout, "%u", i); fprintf(stdout, "%u\t%u", i,
fprintf(stdout, "\ttc=%lu\ttr=%lu\ttu=%lu\tmm=%u", (unsigned)MSTP_Statistics[i].max_master);
fprintf(stdout,
"\t%lu\t%lu\t%lu",
(long unsigned int)MSTP_Statistics[i].token_count, (long unsigned int)MSTP_Statistics[i].token_count,
(long unsigned int)MSTP_Statistics[i].token_retries, (long unsigned int)MSTP_Statistics[i].token_retries,
(long unsigned int)MSTP_Statistics[i].tusage_timeout, (long unsigned int)MSTP_Statistics[i].tusage_timeout);
(unsigned)MSTP_Statistics[i].max_master); fprintf(stdout,
fprintf(stdout, "\ttr-max=%lu", "\t%lu\t%lu\t%lu\t%lu",
(long unsigned int)MSTP_Statistics[i].token_reply_max); (long unsigned int)MSTP_Statistics[i].token_reply,
fprintf(stdout, "\trpfm-max=%lu", (long unsigned int)MSTP_Statistics[i].pfm_reply,
(long unsigned int)MSTP_Statistics[i].pfm_reply_max); (long unsigned int)MSTP_Statistics[i].der_reply,
fprintf(stdout, "\tder-max=%lu", (long unsigned int)MSTP_Statistics[i].reply_postponed);
(long unsigned int)MSTP_Statistics[i].der_reply_max);
fprintf(stdout, "\r\n"); fprintf(stdout, "\r\n");
} }
} }
@@ -209,12 +223,10 @@ static void packet_statistics_clear(void)
MSTP_Statistics[i].token_retries = 0; MSTP_Statistics[i].token_retries = 0;
MSTP_Statistics[i].tusage_timeout = 0; MSTP_Statistics[i].tusage_timeout = 0;
MSTP_Statistics[i].max_master = 0; MSTP_Statistics[i].max_master = 0;
MSTP_Statistics[i].token_reply_min = 0; MSTP_Statistics[i].token_reply = 0;
MSTP_Statistics[i].token_reply_max = 0; MSTP_Statistics[i].pfm_reply = 0;
MSTP_Statistics[i].pfm_reply_min = 0; MSTP_Statistics[i].der_reply = 0;
MSTP_Statistics[i].pfm_reply_max = 0; MSTP_Statistics[i].reply_postponed = 0;
MSTP_Statistics[i].der_reply_min = 0;
MSTP_Statistics[i].der_reply_max = 0;
} }
} }