Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hgfs: subsecond timestamp precision

Browse Source 
Slightly cleaned up version of patch contributed by Antoine Leca.
This commit is contained in:
David van Moolenbroek
2012-03-30 01:40:07 +02:00
parent 75839b75a1
commit 638ce89250
4 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libhgfs/proto.h
+2 -2
View File
@@ -47,5 +47,5 @@ void rpc_close(void);
#define time_put PREFIX(time_put)
#define time_get PREFIX(time_get)
void time_init(void);
void time_put(time_t *timep);
void time_get(time_t *timep);
void time_put(struct timespec *tsp);
void time_get(struct timespec *tsp);
lib/libhgfs/time.c
+18 -18
View File
@@ -7,7 +7,7 @@ static u64_t time_offset;
/*===========================================================================*
* time_init *
*===========================================================================*/
void time_init()
void time_init(void)
{
/* Initialize the time conversion module.
*/
@@ -15,55 +15,55 @@ void time_init()
/* Generate a 64-bit value for the offset to use in time conversion. The
* HGFS time format uses Windows' FILETIME standard, expressing time in
* 100ns-units since Jan 1, 1601 UTC. The value that is generated is
* 116444736000000000.
* the difference between that time and the UNIX epoch, in 100ns units.
*/
/* FIXME: we currently do not take into account timezones. */
time_offset = make64(3577643008UL, 27111902UL);
time_offset = mul64u(116444736, 1000000000);
}
/*===========================================================================*
* time_put *
*===========================================================================*/
void time_put(timep)
time_t *timep;
void time_put(struct timespec *tsp)
{
/* Store a UNIX timestamp pointed to by the given pointer onto the RPC buffer,
/* Store a POSIX timestamp pointed to by the given pointer onto the RPC buffer,
* in HGFS timestamp format. If a NULL pointer is given, store a timestamp of
* zero instead.
*/
u64_t hgfstime;
if (timep != NULL) {
hgfstime = add64(mul64u(*timep, 10000000), time_offset);
if (tsp != NULL) {
hgfstime = add64ul(mul64u(tsp->tv_sec, 10000000), tsp->tv_nsec / 100);
hgfstime = add64(hgfstime, time_offset);
RPC_NEXT32 = ex64lo(hgfstime);
RPC_NEXT32 = ex64hi(hgfstime);
} else {
RPC_NEXT32 = 0;
RPC_NEXT32 = 0;
RPC_NEXT32 = 0;
RPC_NEXT32 = 0;
}
}
/*===========================================================================*
* time_get *
*===========================================================================*/
void time_get(timep)
time_t *timep;
void time_get(struct timespec *tsp)
{
/* Get a HGFS timestamp from the RPC buffer, convert it into a UNIX timestamp,
/* Get a HGFS timestamp from the RPC buffer, convert it into a POSIX timestamp,
* and store the result in the given time pointer. If the given pointer is
* NULL, however, simply skip over the timestamp in the RPC buffer.
*/
u64_t hgfstime;
u32_t time_lo, time_hi;
if (timep != NULL) {
time_lo = RPC_NEXT32;
time_hi = RPC_NEXT32;
if (tsp != NULL) {
time_lo = RPC_NEXT32;
time_hi = RPC_NEXT32;
hgfstime = make64(time_lo, time_hi);
hgfstime = sub64(make64(time_lo, time_hi), time_offset);
*timep = div64u(sub64(hgfstime, time_offset), 10000000);
tsp->tv_sec = div64u(hgfstime, 10000000);
tsp->tv_nsec = rem64u(hgfstime, 10000000) * 100;
}
else RPC_ADVANCE(sizeof(u32_t) * 2);
}