oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages 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:39:12 +02:00
parent 75839b75a1
commit 638ce89250
4 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/minix/hgfs.h
View File

@ -5,6 +5,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <minix/u64.h> #include <minix/u64.h>
#include <time.h>
typedef void *hgfs_file_t; /* handle to open file */ typedef void *hgfs_file_t; /* handle to open file */
typedef void *hgfs_dir_t; /* handle to directory search */ typedef void *hgfs_dir_t; /* handle to directory search */
@ -13,10 +14,10 @@ struct hgfs_attr {
u32_t a_mask; /* which fields to retrieve/set */ u32_t a_mask; /* which fields to retrieve/set */
mode_t a_mode; /* file type and permissions */ mode_t a_mode; /* file type and permissions */
u64_t a_size; /* file size */ u64_t a_size; /* file size */
time_t a_crtime; /* file creation time */ struct timespec a_crtime; /* file creation time */
time_t a_atime; /* file access time */ struct timespec a_atime; /* file access time */
time_t a_mtime; /* file modification time */ struct timespec a_mtime; /* file modification time */
time_t a_ctime; /* file change time */ struct timespec a_ctime; /* file change time */
}; };
#define HGFS_ATTR_SIZE 0x01 /* get/set file size */ #define HGFS_ATTR_SIZE 0x01 /* get/set file size */

4
lib/libhgfs/proto.h
View File

@ -47,5 +47,5 @@ void rpc_close(void);
#define time_put PREFIX(time_put) #define time_put PREFIX(time_put)
#define time_get PREFIX(time_get) #define time_get PREFIX(time_get)
void time_init(void); void time_init(void);
void time_put(time_t *timep); void time_put(struct timespec *tsp);
void time_get(time_t *timep); void time_get(struct timespec *tsp);

36
lib/libhgfs/time.c
View File

@ -7,7 +7,7 @@ static u64_t time_offset;
/*===========================================================================* /*===========================================================================*
* time_init * * time_init *
*===========================================================================*/ *===========================================================================*/
void time_init() void time_init(void)
{ {
/* Initialize the time conversion module. /* 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 /* Generate a 64-bit value for the offset to use in time conversion. The
* HGFS time format uses Windows' FILETIME standard, expressing time in * HGFS time format uses Windows' FILETIME standard, expressing time in
* 100ns-units since Jan 1, 1601 UTC. The value that is generated is * 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. */ /* FIXME: we currently do not take into account timezones. */
time_offset = make64(3577643008UL, 27111902UL); time_offset = mul64u(116444736, 1000000000);
} }
/*===========================================================================* /*===========================================================================*
* time_put * * time_put *
*===========================================================================*/ *===========================================================================*/
void time_put(timep) void time_put(struct timespec *tsp)
time_t *timep;
{ {
/* 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 * in HGFS timestamp format. If a NULL pointer is given, store a timestamp of
* zero instead. * zero instead.
*/ */
u64_t hgfstime; u64_t hgfstime;
if (timep != NULL) { if (tsp != NULL) {
hgfstime = add64(mul64u(*timep, 10000000), time_offset); hgfstime = add64ul(mul64u(tsp->tv_sec, 10000000), tsp->tv_nsec / 100);
hgfstime = add64(hgfstime, time_offset);
RPC_NEXT32 = ex64lo(hgfstime); RPC_NEXT32 = ex64lo(hgfstime);
RPC_NEXT32 = ex64hi(hgfstime); RPC_NEXT32 = ex64hi(hgfstime);
} else { } else {
RPC_NEXT32 = 0; RPC_NEXT32 = 0;
RPC_NEXT32 = 0; RPC_NEXT32 = 0;
} }
} }
/*===========================================================================* /*===========================================================================*
* time_get * * time_get *
*===========================================================================*/ *===========================================================================*/
void time_get(timep) void time_get(struct timespec *tsp)
time_t *timep;
{ {
/* 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 * 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. * NULL, however, simply skip over the timestamp in the RPC buffer.
*/ */
u64_t hgfstime; u64_t hgfstime;
u32_t time_lo, time_hi; u32_t time_lo, time_hi;
if (timep != NULL) { if (tsp != NULL) {
time_lo = RPC_NEXT32; time_lo = RPC_NEXT32;
time_hi = 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); else RPC_ADVANCE(sizeof(u32_t) * 2);
} }

17
servers/hgfs/stat.c
View File

@ -56,8 +56,8 @@ int do_stat()
if ((ino = find_inode(ino_nr)) == NULL) if ((ino = find_inode(ino_nr)) == NULL)
return EINVAL; return EINVAL;
attr.a_mask = HGFS_ATTR_MODE | HGFS_ATTR_SIZE | HGFS_ATTR_ATIME | attr.a_mask = HGFS_ATTR_MODE | HGFS_ATTR_SIZE | HGFS_ATTR_CRTIME |
HGFS_ATTR_MTIME | HGFS_ATTR_CTIME; HGFS_ATTR_ATIME | HGFS_ATTR_MTIME | HGFS_ATTR_CTIME;
if ((r = verify_inode(ino, path, &attr)) != OK) if ((r = verify_inode(ino, path, &attr)) != OK)
return r; return r;
@ -74,9 +74,10 @@ int do_stat()
stat.st_size = LONG_MAX; stat.st_size = LONG_MAX;
else else
stat.st_size = ex64lo(attr.a_size); stat.st_size = ex64lo(attr.a_size);
stat.st_atime = attr.a_atime; stat.st_atimespec = attr.a_atime;
stat.st_mtime = attr.a_mtime; stat.st_mtimespec = attr.a_mtime;
stat.st_ctime = attr.a_ctime; stat.st_ctimespec = attr.a_ctime;
stat.st_birthtimespec = attr.a_crtime;
stat.st_blocks = stat.st_size / S_BLKSIZE; stat.st_blocks = stat.st_size / S_BLKSIZE;
if (stat.st_size % S_BLKSIZE != 0) if (stat.st_size % S_BLKSIZE != 0)
@ -159,8 +160,10 @@ int do_utime()
attr.a_mask = HGFS_ATTR_ATIME | HGFS_ATTR_MTIME | HGFS_ATTR_ATIME_SET | attr.a_mask = HGFS_ATTR_ATIME | HGFS_ATTR_MTIME | HGFS_ATTR_ATIME_SET |
HGFS_ATTR_MTIME_SET; HGFS_ATTR_MTIME_SET;
attr.a_atime = m_in.REQ_ACTIME; attr.a_atime.tv_sec = m_in.REQ_ACTIME;
attr.a_mtime = m_in.REQ_MODTIME; attr.a_atime.tv_nsec = 0;
attr.a_mtime.tv_sec = m_in.REQ_MODTIME;
attr.a_mtime.tv_nsec = 0;
return hgfs_setattr(path, &attr); return hgfs_setattr(path, &attr);
} }