![Ulf Lamping](/assets/img/avatar_default.png)
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ... What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere. As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon. Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way... As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number... svn path=/trunk/; revision=15520
71 lines
2 KiB
C
71 lines
2 KiB
C
/* nstime.h
|
|
* Definition of data structure to hold time values with nanosecond resolution
|
|
*
|
|
* $Id$
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@ethereal.com>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef __NSTIME_H__
|
|
#define __NSTIME_H__
|
|
|
|
#include <time.h>
|
|
|
|
typedef struct {
|
|
time_t secs;
|
|
int nsecs;
|
|
} nstime_t;
|
|
|
|
/* functions */
|
|
|
|
/* set the given nstime_t to zero */
|
|
extern void nstime_set_zero(nstime_t *nstime);
|
|
|
|
/* is the given nstime_t currently zero? */
|
|
extern gboolean nstime_is_zero(nstime_t *nstime);
|
|
|
|
/* calculate the delta between two times (can be negative!)
|
|
*
|
|
* delta = b-a
|
|
*
|
|
* Note that it is acceptable for two or more of the arguments to point at the
|
|
* same structure.
|
|
*/
|
|
extern void nstime_delta(nstime_t *delta, const nstime_t *b, const nstime_t *a );
|
|
|
|
/* calculate the sum of two times
|
|
*
|
|
* sum = a+b
|
|
*
|
|
* Note that it is acceptable for two or more of the arguments to point at the
|
|
* same structure.
|
|
*/
|
|
extern void nstime_sum(nstime_t *sum, const nstime_t *b, const nstime_t *a );
|
|
|
|
/* sum += a */
|
|
#define nstime_add(sum, a) nstime_sum(sum, sum, a)
|
|
|
|
/* converts nstime to double, time base is milli seconds */
|
|
extern double nstime_to_msec(const nstime_t *time);
|
|
|
|
/* converts nstime to double, time base is seconds */
|
|
extern double nstime_to_sec(const nstime_t *time);
|
|
|
|
#endif /* __NSTIME_H__ */
|