Changeset 2612

Timestamp:

16/02/2010 22:12:18 (2 years ago)

Author:

chris

Message:

Move modification time functions out-of-line to help with debugging
them.

Location:

box/trunk/lib/common

Files:

• FileModificationTime.cpp (copied) (copied from box/trunk/lib/common/FileModificationTime.h) (4 diffs)
• FileModificationTime.h (modified) (1 diff)

box/trunk/lib/common/FileModificationTime.cpp

@@ -2 +2 @@
 //
 // File
-//              Name:    FileModificationTime.h
+//              Name:    FileModificationTime.cpp
 //              Purpose: Function for getting file modification time.
-//              Created: 2003/08/28
+//              Created: 2010/02/15
 //
 // --------------------------------------------------------------------------
 
-#ifndef FILEMODIFICATIONTIME__H
-#define FILEMODIFICATIONTIME__H
+#include "Box.h"
 
 #include <sys/stat.h>
 
 #include "BoxTime.h"
+#include "FileModificationTime.h"
 
-inline box_time_t FileModificationTime(EMU_STRUCT_STAT &st)
+#include "MemLeakFindOn.h"
+
+box_time_t FileModificationTime(EMU_STRUCT_STAT &st)
 {
 #ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC
@@ -27 +29 @@
 }
 
-inline box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st)
+box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st)
 {
         box_time_t statusmodified =
@@ -46 +48 @@
 }
 
-inline box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st)
+box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st)
 {
 #ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC
@@ -61 +63 @@
 }
 
-#endif // FILEMODIFICATIONTIME__H
-

box/trunk/lib/common/FileModificationTime.h

@@ -15 +15 @@
 #include "BoxTime.h"
 
-inline box_time_t FileModificationTime(EMU_STRUCT_STAT &st)
-{
-#ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC
-        box_time_t datamodified = ((int64_t)st.st_mtime) * (MICRO_SEC_IN_SEC_LL);
-#else
-        box_time_t datamodified = (((int64_t)st.st_mtimespec.tv_nsec) / NANO_SEC_IN_USEC_LL)
-                        + (((int64_t)st.st_mtimespec.tv_sec) * (MICRO_SEC_IN_SEC_LL));
-#endif
-        
-        return datamodified;
-}
-
-inline box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st)
-{
-        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
-        
-        return statusmodified;
-}
-
-inline box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st)
-{
-#ifndef HAVE_STRUCT_STAT_ST_MTIMESPEC
-        box_time_t datamodified = ((int64_t)st.st_mtime) * (MICRO_SEC_IN_SEC_LL);
-        box_time_t statusmodified = ((int64_t)st.st_ctime) * (MICRO_SEC_IN_SEC_LL);
-#else
-        box_time_t datamodified = (((int64_t)st.st_mtimespec.tv_nsec) / NANO_SEC_IN_USEC_LL)
-                        + (((int64_t)st.st_mtimespec.tv_sec) * (MICRO_SEC_IN_SEC_LL));
-        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));
-#endif
-        
-        return (datamodified > statusmodified)?datamodified:statusmodified;
-}
+box_time_t FileModificationTime(EMU_STRUCT_STAT &st);
+box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st);
+box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st);
 
 #endif // FILEMODIFICATIONTIME__H