The branch, v3-2-test has been updated
via d7c7acee813b3cd9649b381a3e63c0be56e67d29 (commit)
via e0381d6a173dcf64910ac597a10a3f0fa59ffe43 (commit)
via ca155297bf932df6fd4a0ff223e5a7f1b8340f6b (commit)
via 772dcc3b3703507af6baee090602a0ae8633fe2f (commit)
from 31ea6bbc4a964604377509d3c096bae647c614a2 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit d7c7acee813b3cd9649b381a3e63c0be56e67d29
Author: Jeremy Allison <[email protected]>
Date: Thu Jan 29 10:47:02 2009 -0800
Following Björn JACKE's patch, unify the detection of the timespec code in
configure.in, and the application of it in time.c
Jeremy.
commit e0381d6a173dcf64910ac597a10a3f0fa59ffe43
Author: Björn Jacke <[email protected]>
Date: Thu Jan 29 00:33:19 2009 +0100
add configure check for AIX style sub-second resolution support
commit ca155297bf932df6fd4a0ff223e5a7f1b8340f6b
Author: Björn Jacke <[email protected]>
Date: Thu Jan 29 00:20:00 2009 +0100
rather cosmetic fix for failed birthtime configure checks
commit 772dcc3b3703507af6baee090602a0ae8633fe2f
Author: Björn Jacke <[email protected]>
Date: Thu Jan 29 00:17:12 2009 +0100
give configure check "sub-second timestamps without struct timespec" a
chance to succeed
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 92 +++++++++++++++++++++++++++++++++++++++++++++++----
source/lib/time.c | 36 ++++++++++++++++++++
2 files changed, 121 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 08eb67d..215b219 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -1278,7 +1278,8 @@ fi
#################################################
# Check whether struct stat has timestamps with sub-second resolution.
-# At least IRIX and Solaris have these.
+# At least IRIX and Solaris have these. FREEBSD does as well,
+# but with different members
#
# We check that
# all of st_mtim, st_atim and st_ctim exist
@@ -1287,6 +1288,43 @@ fi
# There is some conflicting standards weirdness about whether we should use
# "struct timespec" or "timespec_t". Linux doesn't have timespec_t, so we
# prefer struct timespec.
+AC_CACHE_CHECK([whether struct stat has timespec timestamps],
+ samba_cv_stat_timespec_hires,
+ [
+ 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 = s.st_mtimespec;
+ t = s.st_ctimespec;
+ t = s.st_atimespec;
+ ],
+ samba_cv_stat_timespec_hires=yes, samba_cv_stat_timespec_hires=no)
+ ])
+
+if test x"$samba_cv_stat_timespec_hires" = x"yes" ; then
+ AC_DEFINE(HAVE_STAT_ST_MTIMESPEC, 1, [whether struct stat contains
st_mtimepec])
+ AC_DEFINE(HAVE_STAT_ST_ATIMESPEC, 1, [whether struct stat contains
st_atimespec])
+ AC_DEFINE(HAVE_STAT_ST_CTIMESPEC, 1, [whether struct stat contains
st_ctimespec])
+ AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1, [whether struct stat has
sub-second timestamps])
+fi
+
+
AC_CACHE_CHECK([whether struct stat has sub-second timestamps],
samba_cv_stat_hires,
[
@@ -1327,7 +1365,7 @@ if test x"$samba_cv_stat_hires" = x"yes" ; then
[whether struct stat has sub-second timestamps])
fi
-AC_CACHE_CHECK([whether struct stat has sub-second timestamps without struct
timespec], samba_cv_stat_hires_notimespec,
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps without struct
timespec suffixed nsec], samba_cv_stat_hires_notimespec,
[
AC_TRY_COMPILE(
[
@@ -1355,7 +1393,7 @@ AC_CACHE_CHECK([whether struct stat has sub-second
timestamps without struct tim
t.tv_sec = s.st_atime;
t.tv_nsec = s.st_atimensec;
],
- samba_cv_stat_hires=yes, samba_cv_stat_hires=no)
+ samba_cv_stat_hires_notimespec=yes,
samba_cv_stat_hires_notimespec=no)
])
if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
@@ -1363,7 +1401,47 @@ if test x"$samba_cv_stat_hires_notimespec" = x"yes" ;
then
AC_DEFINE(HAVE_STAT_ST_ATIMENSEC, 1, [whether struct stat contains
st_atimensec])
AC_DEFINE(HAVE_STAT_ST_CTIMENSEC, 1, [whether struct stat contains
st_ctimensec])
AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1,
- [whether struct stat has sub-second timestamps without struct
timespec])
+ [whether struct stat has sub-second timestamps without struct
timespec suffixed nsec])
+fi
+
+dnl AIX stype sub-second timestamps:
+AC_CACHE_CHECK([whether struct stat has sub-second timestamps without struct
timespec suffixed _n], samba_cv_stat_hires_notimespec_n,
+ [
+ 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_mtime_n;
+ t.tv_sec = s.st_ctime;
+ t.tv_nsec = s.st_ctime_n;
+ t.tv_sec = s.st_atime;
+ t.tv_nsec = s.st_atime_n;
+ ],
+ samba_cv_stat_hires_notimespec_n=yes,
samba_cv_stat_hires_notimespec_n=no)
+ ])
+
+if test x"$samba_cv_stat_hires_notimespec_n" = x"yes" ; then
+ AC_DEFINE(HAVE_STAT_ST_MTIME_N, 1, [whether struct stat contains
st_mtime_n])
+ AC_DEFINE(HAVE_STAT_ST_ATIME_N, 1, [whether struct stat contains
st_atime_n])
+ AC_DEFINE(HAVE_STAT_ST_CTIME_N, 1, [whether struct stat contains
st_ctime_n])
+ AC_DEFINE(HAVE_STAT_HIRES_TIMESTAMPS, 1,
+ [whether struct stat has sub-second timestamps without struct
timespec suffixed _n])
fi
AC_CACHE_CHECK([whether struct stat has st_birthtimespec],
samba_cv_stat_st_birthtimespec,
@@ -1389,7 +1467,7 @@ AC_CACHE_CHECK([whether struct stat has
st_birthtimespec], samba_cv_stat_st_birt
struct stat s = {0};
t = s.st_birthtimespec;
],
- samba_cv_stat_st_birthtimespec=yes, samba_cv_stat_birthtimespec=no)
+ samba_cv_stat_st_birthtimespec=yes,
samba_cv_stat_st_birthtimespec=no)
])
if test x"$samba_cv_stat_st_birthtimespec" = x"yes" ; then
@@ -1419,7 +1497,7 @@ AC_CACHE_CHECK([whether struct stat has
st_birthtimensec], samba_cv_stat_st_birt
struct stat s = {0};
t.tv_nsec = s.st_birthtimensec;
],
- samba_cv_stat_st_birthtimensec=yes, samba_cv_stat_birthtimensec=no)
+ samba_cv_stat_st_birthtimensec=yes,
samba_cv_stat_st_birthtimensec=no)
])
if test x"$samba_cv_stat_st_birthtimensec" = x"yes" ; then
@@ -1449,7 +1527,7 @@ AC_CACHE_CHECK([whether struct stat has st_birthtime],
samba_cv_stat_st_birthtim
struct stat s = {0};
t = s.st_birthtime;
],
- samba_cv_stat_st_birthtime=yes, samba_cv_stat_birthtime=no)
+ samba_cv_stat_st_birthtime=yes, samba_cv_stat_st_birthtime=no)
])
if test x"$samba_cv_stat_st_birthtime" = x"yes" ; then
diff --git a/source/lib/time.c b/source/lib/time.c
index 425539c..3ff601a 100644
--- a/source/lib/time.c
+++ b/source/lib/time.c
@@ -903,6 +903,13 @@ struct timespec get_atimespec(const SMB_STRUCT_STAT *pst)
ret.tv_sec = pst->st_atime;
ret.tv_nsec = pst->st_atimensec;
return ret;
+#elif defined(HAVE_STAT_ST_ATIME_N)
+ struct timespec ret;
+ ret.tv_sec = pst->st_atime;
+ ret.tv_nsec = pst->st_atime_n;
+ return ret;
+#elif defined(HAVE_STAT_ST_ATIMESPEC)
+ return pst->st_atimespec;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
@@ -920,6 +927,11 @@ void set_atimespec(SMB_STRUCT_STAT *pst, struct timespec
ts)
#elif defined(HAVE_STAT_ST_ATIMENSEC)
pst->st_atime = ts.tv_sec;
pst->st_atimensec = ts.tv_nsec
+#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_ATIMESPEC)
+ pst->st_atimespec = ts;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
@@ -943,6 +955,13 @@ struct timespec get_mtimespec(const SMB_STRUCT_STAT *pst)
ret.tv_sec = pst->st_mtime;
ret.tv_nsec = pst->st_mtimensec;
return ret;
+#elif defined(HAVE_STAT_ST_MTIME_N)
+ struct timespec ret;
+ ret.tv_sec = pst->st_mtime;
+ ret.tv_nsec = pst->st_mtime_n;
+ return ret;
+#elif defined(HAVE_STAT_ST_MTIMESPEC)
+ return pst->st_mtimespec;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
@@ -960,6 +979,11 @@ void set_mtimespec(SMB_STRUCT_STAT *pst, struct timespec
ts)
#elif defined(HAVE_STAT_ST_MTIMENSEC)
pst->st_mtime = ts.tv_sec;
pst->st_mtimensec = ts.tv_nsec
+#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_MTIMESPEC)
+ pst->st_mtimespec = ts;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
@@ -983,6 +1007,13 @@ struct timespec get_ctimespec(const SMB_STRUCT_STAT *pst)
ret.tv_sec = pst->st_ctime;
ret.tv_nsec = pst->st_ctimensec;
return ret;
+#elif defined(HAVE_STAT_ST_CTIME_N)
+ struct timespec ret;
+ ret.tv_sec = pst->st_ctime;
+ ret.tv_nsec = pst->st_ctime_n;
+ return ret;
+#elif defined(HAVE_STAT_ST_CTIMESPEC)
+ return pst->st_ctimespec;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
@@ -1000,6 +1031,11 @@ void set_ctimespec(SMB_STRUCT_STAT *pst, struct timespec
ts)
#elif defined(HAVE_STAT_ST_CTIMENSEC)
pst->st_ctime = ts.tv_sec;
pst->st_ctimensec = ts.tv_nsec
+#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_CTIMESPEC)
+ pst->st_ctimespec = ts;
#else
#error CONFIGURE_ERROR_IN_DETECTING_TIMESPEC_IN_STAT
#endif
--
Samba Shared Repository
