* 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. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
+
#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)
- {
+ 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;
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)
+int timeval_add_time(struct timeval *result, long sec, long usec)
{
result->tv_sec += sec;
result->tv_usec += usec;
- while (result->tv_usec > 1000000)
- {
+ while (result->tv_usec > 1000000) {
result->tv_usec -= 1000000;
result->tv_sec++;
}
return retval;
}
-float duration_elapsed(struct duration *duration)
+float duration_elapsed(const 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)
+float duration_kbps(const 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;
-}