[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4887-g61465c5

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  61465c57b9579a6f25381a9f16bca0852ca67f75 (commit)
       via  bc59a4398fb264c75e60881b2eda0f71d05048f0 (commit)
      from  ee90448a7aa0a0972e5801b319a011fd52750c20 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 61465c57b9579a6f25381a9f16bca0852ca67f75
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jan 29 22:59:00 2009 +0100

    add Tru64 sub-second resolution timestamp support

commit bc59a4398fb264c75e60881b2eda0f71d05048f0
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jan 29 21:59:44 2009 +0100

    add configure check for Tru64 sub-second timestamp resolution

-----------------------------------------------------------------------

Summary of changes:
 source/configure.in |   40 ++++++++++++++++++++++++++++++++++++++++
 source/lib/time.c   |   24 ++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/configure.in b/source/configure.in
index da78375..f9f882e 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1464,6 +1464,46 @@ if test x"$samba_cv_stat_hires_notimespec_n" = x"yes" ; then
 	    [whether struct stat has sub-second timestamps without struct timespec suffixed _n])
 fi
 
+dnl Tru64 has _micro_second_ resolution:
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps in st_uXtime], samba_cv_stat_hires_uxtime,
+    [
+	AC_TRY_COMPILE(
+	    [
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+	    ],
+	    [
+		struct timespec t;
+		struct stat s = {0};
+		t.tv_sec = s.st_mtime;
+		t.tv_nsec = s.st_umtime * 1000;
+		t.tv_sec = s.st_ctime;
+		t.tv_nsec = s.st_uctime * 1000;
+		t.tv_sec = s.st_atime;
+		t.tv_nsec = s.st_uatime * 1000;
+	    ],
+	    samba_cv_stat_hires_uxtime=yes, samba_cv_stat_hires_uxtime=no)
+    ])
+
+if test x"$samba_cv_stat_hires_uxtime" = x"yes" ; then
+    AC_DEFINE(HAVE_STAT_ST_UMTIME, 1, [whether struct stat contains st_umtime])
+    AC_DEFINE(HAVE_STAT_ST_UATIME, 1, [whether struct stat contains st_uatime])
+    AC_DEFINE(HAVE_STAT_ST_UCTIME, 1, [whether struct stat contains st_uctime])
+    AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1,
+	    [whether struct stat has sub-second timestamps in st_uXtime])
+fi
+
 AC_CACHE_CHECK([whether struct stat has st_birthtimespec], samba_cv_stat_st_birthtimespec,
     [
 	AC_TRY_COMPILE(
diff --git a/source/lib/time.c b/source/lib/time.c
index 8088110..0da4b5b 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -908,6 +908,11 @@ struct timespec get_atimespec(const SMB_STRUCT_STAT *pst)
 	ret.tv_sec = pst->st_atime;
 	ret.tv_nsec = pst->st_atime_n;
 	return ret;
+#elif defined(HAVE_STAT_ST_UATIME)
+	struct timespec ret;
+	ret.tv_sec = pst->st_atime;
+	ret.tv_nsec = pst->st_uatime * 1000;
+	return ret;
 #elif defined(HAVE_STAT_ST_ATIMESPEC)
 	return pst->st_atimespec;
 #else
@@ -930,6 +935,9 @@ void set_atimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_ATIME_N)
 	pst->st_atime = ts.tv_sec;
 	pst->st_atime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UATIME)
+	pst->st_atime = ts.tv_sec;
+	pst->st_uatime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_ATIMESPEC)
 	pst->st_atimespec = ts;
 #else
@@ -960,6 +968,11 @@ struct timespec get_mtimespec(const SMB_STRUCT_STAT *pst)
 	ret.tv_sec = pst->st_mtime;
 	ret.tv_nsec = pst->st_mtime_n;
 	return ret;
+#elif defined(HAVE_STAT_ST_UMTIME)
+	struct timespec ret;
+	ret.tv_sec = pst->st_mtime;
+	ret.tv_nsec = pst->st_umtime * 1000;
+	return ret;
 #elif defined(HAVE_STAT_ST_MTIMESPEC)
 	return pst->st_mtimespec;
 #else
@@ -982,6 +995,9 @@ void set_mtimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_MTIME_N)
 	pst->st_mtime = ts.tv_sec;
 	pst->st_mtime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UMTIME)
+	pst->st_mtime = ts.tv_sec;
+	pst->st_umtime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_MTIMESPEC)
 	pst->st_mtimespec = ts;
 #else
@@ -1012,6 +1028,11 @@ struct timespec get_ctimespec(const SMB_STRUCT_STAT *pst)
 	ret.tv_sec = pst->st_ctime;
 	ret.tv_nsec = pst->st_ctime_n;
 	return ret;
+#elif defined(HAVE_STAT_ST_UCTIME)
+	struct timespec ret;
+	ret.tv_sec = pst->st_ctime;
+	ret.tv_nsec = pst->st_uctime * 1000;
+	return ret;
 #elif defined(HAVE_STAT_ST_CTIMESPEC)
 	return pst->st_ctimespec;
 #else
@@ -1034,6 +1055,9 @@ void set_ctimespec(SMB_STRUCT_STAT *pst, struct timespec ts)
 #elif defined(HAVE_STAT_ST_CTIME_N)
 	pst->st_ctime = ts.tv_sec;
 	pst->st_ctime_n = ts.tv_nsec;
+#elif defined(HAVE_STAT_ST_UCTIME)
+	pst->st_ctime = ts.tv_sec;
+	pst->st_uctime = ts.tv_nsec / 1000;
 #elif defined(HAVE_STAT_ST_CTIMESPEC)
 	pst->st_ctimespec = ts;
 #else


-- 
Samba Shared Repository