2689f58f2a
This patch changes the duration_* API in several ways. First, it updates the API to use better names. Second, string formatting has been removed from the API (with its associated malloc). Finally, a new function added to convert the time into seconds, which can be used (or formatted) by the caller. This eliminates hidden calls to malloc that require associated calls to free(). This patch also removes the useless extern keyword from prototypes, and it eliminates the duration_t typedef (use 'struct duration'). These API also allows proper error checking, as it is possible for gettimeofday to fail in certain circumstances. The consumers have all been chased to use this new API as well, as there were relatively few cases doing this type of measurement. In most cases, the code performs additional checks for errors, but the calling code looks much cleaner in every case.
122 lines
3.8 KiB
C
122 lines
3.8 KiB
C
/***************************************************************************
|
|
* Copyright (C) 2006 by Dominic Rath *
|
|
* Dominic.Rath@gmx.de *
|
|
* *
|
|
* Copyright (C) 2007,2008 Øyvind Harboe *
|
|
* oyvind.harboe@zylin.com *
|
|
* *
|
|
* Copyright (C) 2008 by Spencer Oliver *
|
|
* spen@spen-soft.co.uk *
|
|
* *
|
|
* This program is free software; you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation; either version 2 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* This program is distributed in the hope that it will be useful, *
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
|
* GNU General Public License for more details. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program; if not, write to the *
|
|
* Free Software Foundation, Inc., *
|
|
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
|
***************************************************************************/
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "time_support.h"
|
|
|
|
|
|
/* calculate difference between two struct timeval values */
|
|
int timeval_subtract(struct timeval *result, struct timeval *x, struct timeval *y)
|
|
{
|
|
if (x->tv_usec < y->tv_usec)
|
|
{
|
|
int nsec = (y->tv_usec - x->tv_usec) / 1000000 + 1;
|
|
y->tv_usec -= 1000000 * nsec;
|
|
y->tv_sec += nsec;
|
|
}
|
|
if (x->tv_usec - y->tv_usec > 1000000) {
|
|
int nsec = (x->tv_usec - y->tv_usec) / 1000000;
|
|
y->tv_usec += 1000000 * nsec;
|
|
y->tv_sec -= nsec;
|
|
}
|
|
|
|
result->tv_sec = x->tv_sec - y->tv_sec;
|
|
result->tv_usec = x->tv_usec - y->tv_usec;
|
|
|
|
/* Return 1 if result is negative. */
|
|
return x->tv_sec < y->tv_sec;
|
|
}
|
|
|
|
/* add two struct timeval values */
|
|
int timeval_add(struct timeval *result, struct timeval *x, struct timeval *y)
|
|
{
|
|
result->tv_sec = x->tv_sec + y->tv_sec;
|
|
|
|
result->tv_usec = x->tv_usec + y->tv_usec;
|
|
|
|
while (result->tv_usec > 1000000)
|
|
{
|
|
result->tv_usec -= 1000000;
|
|
result->tv_sec++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int timeval_add_time(struct timeval *result, int sec, int usec)
|
|
{
|
|
result->tv_sec += sec;
|
|
result->tv_usec += usec;
|
|
|
|
while (result->tv_usec > 1000000)
|
|
{
|
|
result->tv_usec -= 1000000;
|
|
result->tv_sec++;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int duration_start(struct duration *duration)
|
|
{
|
|
return gettimeofday(&duration->start, NULL);
|
|
}
|
|
|
|
int duration_measure(struct duration *duration)
|
|
{
|
|
struct timeval end;
|
|
int retval = gettimeofday(&end, NULL);
|
|
if (0 == retval)
|
|
timeval_subtract(&duration->elapsed, &end, &duration->start);
|
|
return retval;
|
|
}
|
|
|
|
float duration_elapsed(struct duration *duration)
|
|
{
|
|
float t = duration->elapsed.tv_sec;
|
|
t += (float)duration->elapsed.tv_usec / 1000000.0;
|
|
return t;
|
|
}
|
|
|
|
float duration_kbps(struct duration *duration, size_t count)
|
|
{
|
|
return count / (1024.0 * duration_elapsed(duration));
|
|
}
|
|
|
|
long long timeval_ms()
|
|
{
|
|
struct timeval now;
|
|
long long t = 0;
|
|
gettimeofday(&now, NULL);
|
|
|
|
t += now.tv_usec/1000;
|
|
t += now.tv_sec*1000;
|
|
|
|
return t;
|
|
}
|