Fix: sessiond: erroneous error code returned on rotation failure

[lttng-tools.git] / src / bin / lttng-sessiond / ust-clock.h

diff --git a/src/bin/lttng-sessiond/ust-clock.h b/src/bin/lttng-sessiond/ust-clock.h
index 8493737634a72d8656e6ddb155aa68d6452c33ea..ee53a99a173b6bafc0556913b871127fd4d936ce 100644 (file)
--- a/src/bin/lttng-sessiond/ust-clock.h
+++ b/src/bin/lttng-sessiond/ust-clock.h
@@ -1,26 +1,15 @@
 /*
- * Copyright (C) 2010  Pierre-Marc Fournier
- * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010 Pierre-Marc Fournier
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #ifndef _UST_CLOCK_H
 #define _UST_CLOCK_H
 
-#include <time.h>
+#include <common/compat/time.h>
 #include <sys/time.h>
 #include <stdint.h>
 #include <stddef.h>
@@ -29,7 +18,7 @@
 #include <urcu/arch.h>
 #include <lttng/ust-clock.h>
 
-#include <common/compat/uuid.h>
+#include <common/uuid.h>
 
 /* TRACE CLOCK */
 
@@ -57,7 +46,12 @@ uint64_t trace_clock_read64_monotonic(void)
 {
        struct timespec ts;
 
-       clock_gettime(CLOCK_MONOTONIC, &ts);
+       if (lttng_clock_gettime(CLOCK_MONOTONIC, &ts)) {
+               /* TODO Report error cleanly up the chain. */
+               PERROR("clock_gettime CLOCK_MONOTONIC");
+               ts.tv_sec = 0;
+               ts.tv_nsec = 0;
+       }
        return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }