--- mqtt/src/mqtt_ping.c 2012/05/01 22:19:29 1.1.2.4 +++ mqtt/src/mqtt_ping.c 2012/05/03 13:39:35 1.1.2.5 @@ -36,9 +36,9 @@ cleanArgs(struct tagArgs * __restrict args) } static int -Ping(int sock, int num) +Ping(int sock, int num, struct timeval * __restrict accu) { - struct timeval before, after; + struct timeval before, after, calc; ait_val_t val; gettimeofday(&before, NULL); @@ -48,8 +48,11 @@ Ping(int sock, int num) gettimeofday(&after, NULL); + timersub(&after, &before, &calc); + timeradd(accu, &calc, accu); + printf(" + Ping %d MQTT broker %s ... %f sec.\n", num, io_n2addr(&args->addr, &val), - ((after.tv_sec - before.tv_sec) + (after.tv_usec - before.tv_usec) / 1.e6)); + calc.tv_sec + calc.tv_usec / 1.e6); AIT_FREE_VAL(&val); return 0; @@ -64,6 +67,7 @@ main(int argc, char **argv) u_short port = atoi(MQTT_PORT); int num = 1, ret = 0, lost = 0; register int i; + struct timeval accu; if (!(args = malloc(sizeof(struct tagArgs)))) { printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno)); @@ -88,6 +92,7 @@ main(int argc, char **argv) switch (ch) { case 'c': num = (int) strtol(optarg, NULL, 0); + break; case 'T': args->ka = (u_short) strtol(optarg, NULL, 0); break; @@ -164,13 +169,15 @@ main(int argc, char **argv) break; } + timerclear(&accu); if (ret == MQTT_RETCODE_ACCEPTED) { for (i = 0; i < num; i++) - if ((ret = Ping(args->cli->sock, i))) { + if ((ret = Ping(args->cli->sock, i, &accu))) { ret = 3; lost++; } - printf("\nMQTT ping sended %d requests with %d lost responses\n", num, lost); + printf("\nMQTT ping sended %d requests with %d lost responses and avarage %f sec.\n", + num, lost, (accu.tv_sec + accu.tv_usec / 1.e6) / (num - lost)); } else ret = 4;