Changeset 740 for vendor/current/lib/util/time.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/lib/util/time.c (modified) (6 diffs)

vendor/current/lib/util/time.c

@@ -5 +5 @@
    Copyright (C) Andrew Tridgell                1992-2004
    Copyright (C) Stefan (metze) Metzmacher      2002   
+   Copyright (C) Jeremy Allison                 2007
+   Copyright (C) Andrew Bartlett                2011
 
    This program is free software; you can redistribute it and/or modify
@@ -56 +58 @@
 }
 
+/**
+a wrapper to preferably get the monotonic time
+**/
+_PUBLIC_ void clock_gettime_mono(struct timespec *tp)
+{
+        if (clock_gettime(CUSTOM_CLOCK_MONOTONIC,tp) != 0) {
+                clock_gettime(CLOCK_REALTIME,tp);
+        }
+}
+
+/**
+a wrapper to preferably get the monotonic time in seconds
+as this is only second resolution we can use the cached
+(and much faster) COARSE clock variant
+**/
+_PUBLIC_ time_t time_mono(time_t *t)
+{
+        struct timespec tp;
+        int rc = -1;
+#ifdef CLOCK_MONOTONIC_COARSE
+        rc = clock_gettime(CLOCK_MONOTONIC_COARSE,&tp);
+#endif
+        if (rc != 0) {
+                clock_gettime_mono(&tp);
+        }
+        if (t != NULL) {
+                *t = tp.tv_sec;
+        }
+        return tp.tv_sec;
+}
+
 
 #define TIME_FIXUP_CONSTANT 11644473600LL
@@ -61 +94 @@
 time_t convert_timespec_to_time_t(struct timespec ts)
 {
+        /* Ensure tv_nsec is less than 1sec. */
+        while (ts.tv_nsec > 1000000000) {
+                ts.tv_sec += 1;
+                ts.tv_nsec -= 1000000000;
+        }
+
         /* 1 ns == 1,000,000,000 - one thousand millionths of a second.
            increment if it's greater than 500 millionth of a second. */
+
         if (ts.tv_nsec > 500000000) {
                 return ts.tv_sec + 1;
@@ -300 +340 @@
 
 
+/****************************************************************************
+ Return the date and time as a string
+****************************************************************************/
+
+char *timeval_string(TALLOC_CTX *ctx, const struct timeval *tp, bool hires)
+{
+        time_t t;
+        struct tm *tm;
+
+        t = (time_t)tp->tv_sec;
+        tm = localtime(&t);
+        if (!tm) {
+                if (hires) {
+                        return talloc_asprintf(ctx,
+                                               "%ld.%06ld seconds since the Epoch",
+                                               (long)tp->tv_sec,
+                                               (long)tp->tv_usec);
+                } else {
+                        return talloc_asprintf(ctx,
+                                               "%ld seconds since the Epoch",
+                                               (long)t);
+                }
+        } else {
+#ifdef HAVE_STRFTIME
+                char TimeBuf[60];
+                if (hires) {
+                        strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %H:%M:%S",tm);
+                        return talloc_asprintf(ctx,
+                                               "%s.%06ld", TimeBuf,
+                                               (long)tp->tv_usec);
+                } else {
+                        strftime(TimeBuf,sizeof(TimeBuf)-1,"%Y/%m/%d %H:%M:%S",tm);
+                        return talloc_strdup(ctx, TimeBuf);
+                }
+#else
+                if (hires) {
+                        const char *asct = asctime(tm);
+                        return talloc_asprintf(ctx, "%s.%06ld",
+                                        asct ? asct : "unknown",
+                                        (long)tp->tv_usec);
+                } else {
+                        const char *asct = asctime(tm);
+                        return talloc_asprintf(ctx, asct ? asct : "unknown");
+                }
+#endif
+        }
+}
+
+char *current_timestring(TALLOC_CTX *ctx, bool hires)
+{
+        struct timeval tv;
+
+        GetTimeOfDay(&tv);
+        return timeval_string(ctx, &tv, hires);
+}
+
+
 /**
 return a HTTP/1.0 time string
@@ -347 +444 @@
 
 #ifdef HAVE_STRFTIME
-        /* some versions of gcc complain about using %c. This is a bug
-           in the gcc warning, not a bug in this code. See a recent
-           strftime() manual page for details.
-         */
-        strftime(tempTime,sizeof(tempTime)-1,"%c %Z",tm);
+        /* Some versions of gcc complain about using some special format
+         * specifiers. This is a bug in gcc, not a bug in this code. See a
+         * recent strftime() manual page for details. */
+        strftime(tempTime,sizeof(tempTime)-1,"%a %b %e %X %Y %Z",tm);
         TimeBuf = talloc_strdup(mem_ctx, tempTime);
 #else
@@ -398 +494 @@
         int64_t sec_diff = tv1->tv_sec - tv2->tv_sec;
         return (sec_diff * 1000000) + (int64_t)(tv1->tv_usec - tv2->tv_usec);
+}
+
+/**
+  return (tp1 - tp2) in microseconds
+*/
+_PUBLIC_ int64_t nsec_time_diff(const struct timespec *tp1, const struct timespec *tp2)
+{
+        int64_t sec_diff = tp1->tv_sec - tp2->tv_sec;
+        return (sec_diff * 1000000000) + (int64_t)(tp1->tv_nsec - tp2->tv_nsec);
 }