Changeset 2080

Timestamp:

31/01/2008 23:43:24 (4 years ago)

Author:

chris

Message:

Add support for nanosecond timestamps in struct stat on Linux.

Location:

box/trunk

Files:

• configure.ac (modified) (1 diff)
• lib/common/FileModificationTime.h (modified) (1 diff)

box/trunk/configure.ac

@@ -160 +160 @@
 AC_CHECK_MEMBERS([struct stat.st_flags])
 AC_CHECK_MEMBERS([struct stat.st_mtimespec])
+AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec])
+AC_CHECK_MEMBERS([struct stat.st_atimensec])
 AC_CHECK_MEMBERS([struct sockaddr_in.sin_len],,, [[
   #include <sys/types.h>

box/trunk/lib/common/FileModificationTime.h

@@ -29 +29 @@
 inline box_time_t FileAttrModificationTime(struct stat &st)
 {
-#ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC
-        box_time_t statusmodified = ((int64_t)st.st_ctime) * (MICRO_SEC_IN_SEC_LL);
-#else
-        box_time_t statusmodified = (((int64_t)st.st_ctimespec.tv_nsec) / NANO_SEC_IN_USEC_LL)
-                        + (((int64_t)st.st_ctimespec.tv_sec) * (MICRO_SEC_IN_SEC_LL));
+        box_time_t statusmodified =
+#ifdef HAVE_STRUCT_STAT_ST_MTIMESPEC
+                (((int64_t)st.st_ctimespec.tv_nsec) / (NANO_SEC_IN_USEC_LL)) +
+                (((int64_t)st.st_ctimespec.tv_sec)  * (MICRO_SEC_IN_SEC_LL));
+#elif defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
+                (((int64_t)st.st_ctim.tv_nsec) / (NANO_SEC_IN_USEC_LL)) +
+                (((int64_t)st.st_ctim.tv_sec)  * (MICRO_SEC_IN_SEC_LL));
+#elif defined HAVE_STRUCT_STAT_ST_ATIMENSEC
+                (((int64_t)st.st_ctimensec) / (NANO_SEC_IN_USEC_LL)) +
+                (((int64_t)st.st_ctime)     * (MICRO_SEC_IN_SEC_LL));
+#else // no nanoseconds anywhere
+                (((int64_t)st.st_ctime) * (MICRO_SEC_IN_SEC_LL));
 #endif