mqtt/src/mqtt_ping.c - diff

Return to mqtt_ping.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/mqtt_ping.c between versions 1.1.2.4 and 1.2

version 1.1.2.4, 2012/05/01 22:19:29	version 1.2, 2012/07/03 09:02:50
Line 36 cleanArgs(struct tagArgs * __restrict args)	Line 36 cleanArgs(struct tagArgs * __restrict args)
}	}

static int	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;	ait_val_t val;

gettimeofday(&before, NULL);	gettimeofday(&before, NULL);
Line 48 Ping(int sock, int num)	Line 48 Ping(int sock, int num)

gettimeofday(&after, NULL);	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),	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);	AIT_FREE_VAL(&val);

return 0;	return 0;
Line 64 main(int argc, char **argv)	Line 67 main(int argc, char **argv)
u_short port = atoi(MQTT_PORT);	u_short port = atoi(MQTT_PORT);
int num = 1, ret = 0, lost = 0;	int num = 1, ret = 0, lost = 0;
register int i;	register int i;
	struct timeval accu;

if (!(args = malloc(sizeof(struct tagArgs)))) {	if (!(args = io_malloc(sizeof(struct tagArgs)))) {
printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));	printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
return 1;	return 1;
} else	} else
Line 75 main(int argc, char **argv)	Line 79 main(int argc, char **argv)
if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
args->free(args);	args->free(args);
free(args);	io_free(args);
return 1;	return 1;
}	}

Line 88 main(int argc, char **argv)	Line 92 main(int argc, char **argv)
switch (ch) {	switch (ch) {
case 'c':	case 'c':
num = (int) strtol(optarg, NULL, 0);	num = (int) strtol(optarg, NULL, 0);
	break;
case 'T':	case 'T':
args->ka = (u_short) strtol(optarg, NULL, 0);	args->ka = (u_short) strtol(optarg, NULL, 0);
break;	break;
Line 108 main(int argc, char **argv)	Line 113 main(int argc, char **argv)
case 'h':	case 'h':
default:	default:
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
Line 117 main(int argc, char **argv)	Line 122 main(int argc, char **argv)
if (argc < 2) {	if (argc < 2) {
printf("Error:: host for connect not found or connection id!\n\n");	printf("Error:: host for connect not found or connection id!\n\n");
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
} else {	} else {
Line 127 main(int argc, char **argv)	Line 132 main(int argc, char **argv)
if (!io_gethostbyname(*argv, port, &args->addr)) {	if (!io_gethostbyname(*argv, port, &args->addr)) {
printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());	printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
AIT_FREE_VAL(&val);	AIT_FREE_VAL(&val);

if (!(args->cli = mqtt_cli_Open(&args->addr.sa))) {	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
args->free(args);	args->free(args);
free(args);	io_free(args);
return 2;	return 2;
}	}

Line 164 main(int argc, char **argv)	Line 169 main(int argc, char **argv)
break;	break;
}	}

	timerclear(&accu);
if (ret == MQTT_RETCODE_ACCEPTED) {	if (ret == MQTT_RETCODE_ACCEPTED) {
for (i = 0; i < num; i++)	for (i = 0; i < num; i++)
if ((ret = Ping(args->cli->sock, i))) {	if ((ret = Ping(args->cli->sock, i, &accu))) {
ret = 3;	ret = 3;
lost++;	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	} else
ret = 4;	ret = 4;

mqtt_cli_Close(&args->cli);	mqtt_cli_Close(&args->cli);

args->free(args);	args->free(args);
free(args);	io_free(args);
return ret;	return ret;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.4
changed lines
	Added in v.1.2