Port: Remove _GNU_SOURCE, defined in config.h

[lttng-tools.git] / src / bin / lttng-sessiond / ust-metadata.c

diff --git a/src/bin/lttng-sessiond/ust-metadata.c b/src/bin/lttng-sessiond/ust-metadata.c
index b67921ef81b88c2712aea27365a694a8dcc113c0..71bcf7e7d325f61764de8832b8877a0b5e7e30ed 100644 (file)
--- a/src/bin/lttng-sessiond/ust-metadata.c
+++ b/src/bin/lttng-sessiond/ust-metadata.c
@@ -19,7 +19,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stdint.h>
 #include <string.h>
@@ -38,6 +37,7 @@
 #define max_t(type, a, b)      ((type) ((a) > (b) ? (a) : (b)))
 #endif
 
+#define NSEC_PER_SEC                   1000000000ULL
 #define NR_CLOCK_OFFSET_SAMPLES                10
 
 struct offset_sample {
@@ -358,7 +358,7 @@ int ust_metadata_event_statedump(struct ust_registry_session *session,
 
        ret = lttng_metadata_printf(session,
                "       loglevel = %d;\n",
-               event->loglevel);
+               event->loglevel_value);
        if (ret)
                goto end;
 
@@ -370,23 +370,6 @@ int ust_metadata_event_statedump(struct ust_registry_session *session,
                        goto end;
        }
 
-#if 0 /* context for events not supported */
-       if (event->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       context := struct {\n");
-               if (ret)
-                       goto end;
-       }
-       ret = _lttng_context_metadata_statedump(session, event->ctx);
-       if (ret)
-               goto end;
-       if (event->ctx) {
-               ret = lttng_metadata_printf(session,
-                       "       };\n");
-               if (ret)
-                       goto end;
-       }
-#endif
        ret = lttng_metadata_printf(session,
                "       fields := struct {\n"
                );
@@ -543,10 +526,11 @@ int measure_single_clock_offset(struct offset_sample *sample)
                return 0;
        }
        offset = (monotonic[0] + monotonic[1]) >> 1;
-       realtime = (uint64_t) rts.tv_sec * 1000000000ULL;
-       realtime += rts.tv_nsec;
-       if (tcf != 1000000000ULL) {
-               realtime /= 1000000000ULL / tcf;
+       realtime = (uint64_t) rts.tv_sec * tcf;
+       if (tcf == NSEC_PER_SEC) {
+               realtime += rts.tv_nsec;
+       } else {
+               realtime += (uint64_t) rts.tv_nsec * tcf / NSEC_PER_SEC;
        }
        offset = realtime - offset;
        sample->offset = offset;