Close stream and channel file descriptors as soon as passed to sessiond

[lttng-ust.git] / liblttng-ust / ltt-events.c

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index f69eb07a8181ebb395afbc28d877c62291d0217c..ee88b43142d6e39c57f974102ba45328a7aef210 100644 (file)
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -309,10 +309,20 @@ int ltt_session_enable(struct ltt_session *session)
        cds_list_for_each_entry(chan, &session->chan, list) {
                if (chan->header_type)
                        continue;               /* don't change it if session stop/restart */
+               /*
+                * Because we don't use any timer in the application, we
+                * currently cannot guarantee that we have frequent
+                * events that let us detect 27-bit overflows.
+                * Therefore, for now, we force large event headers,
+                * which contain 64-bit timestamps.
+                */
+               chan->header_type = 2;  /* large */
+#if 0
                if (chan->free_event_id < 31)
                        chan->header_type = 1;  /* compact */
                else
                        chan->header_type = 2;  /* large */
+#endif //0
        }
 
        CMM_ACCESS_ONCE(session->active) = 1;
@@ -391,8 +401,8 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
                                       size_t subbuf_size, size_t num_subbuf,
                                       unsigned int switch_timer_interval,
                                       unsigned int read_timer_interval,
-                                      int *shm_fd, int *wait_fd,
-                                      uint64_t *memory_map_size,
+                                      int **shm_fd, int **wait_fd,
+                                      uint64_t **memory_map_size,
                                       struct ltt_channel *chan_priv_init)
 {
        struct ltt_channel *chan = NULL;