X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.cpp;h=35cbff95eb713d66a9f67be072d6472bee751b84;hb=e74015680521597497c3218160a9e80081932896;hp=0ea15c7613467565c398912020f6609e279ff522;hpb=7d91f1ac08c6021842ae28aaf3b5c93a8184b0f5;p=babeltrace.git

diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 0ea15c76..35cbff95 100644
--- a/src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/src/plugins/ctf/lttng-live/lttng-live.cpp
@@ -8,28 +8,25 @@
  * Babeltrace CTF LTTng-live Client Component
  */
 
+#include <glib.h>
+#include <inttypes.h>
+#include <unistd.h>
+
+#include <babeltrace2/babeltrace.h>
+
 #define BT_COMP_LOG_SELF_COMP self_comp
 #define BT_LOG_OUTPUT_LEVEL   log_level
 #define BT_LOG_TAG            "PLUGIN/SRC.CTF.LTTNG-LIVE"
 #include "logging/comp-logging.h"
 
-#include <inttypes.h>
-#include <stdbool.h>
-#include <unistd.h>
-
-#include <glib.h>
-
 #include "common/assert.h"
-#include <babeltrace2/babeltrace.h>
-#include "compat/compiler.h"
-#include <babeltrace2/types.h>
 
 #include "plugins/common/muxing/muxing.h"
 #include "plugins/common/param-validation/param-validation.h"
 
 #include "data-stream.hpp"
-#include "metadata.hpp"
 #include "lttng-live.hpp"
+#include "metadata.hpp"
 
 #define MAX_QUERY_SIZE                     (256 * 1024)
 #define URL_PARAM                          "url"
@@ -1112,7 +1109,7 @@ handle_late_message(struct lttng_live_msg_iter *lttng_live_msg_iter,
      * by this component. We CANNOT send it as is.
      *
      * The only expected scenario in which that could happen is the
-     * following, everything else is a bug in this component, relay deamon,
+     * following, everything else is a bug in this component, relay daemon,
      * or CTF parser.
      *
      * Expected scenario: The CTF message iterator emitted discarded
@@ -1279,7 +1276,7 @@ next_stream_iterator_for_trace(struct lttng_live_msg_iter *lttng_live_msg_iter,
 
             /*
              * Get the timestamp in nanoseconds from origin of this
-             * messsage.
+             * message.
              */
             live_get_msg_ts_ns(lttng_live_msg_iter, msg, lttng_live_msg_iter->last_msg_ts_ns,
                                &curr_msg_ts_ns);
@@ -1687,7 +1684,7 @@ lttng_live_msg_iter_next(bt_self_message_iterator *self_msg_it, bt_message_array
 
         /*
          * Insert the next message to the message batch. This will set
-         * stream iterator current messsage to NULL so that next time
+         * stream iterator current message to NULL so that next time
          * we fetch the next message of that stream iterator
          */
         BT_MESSAGE_MOVE_REF(msgs[*count], youngest_stream_iter->current_msg);
@@ -1707,7 +1704,7 @@ return_status:
         /*
          * If we gathered messages, return _OK even if the graph was
          * interrupted. This allows for the components downstream to at
-         * least get the thoses messages. If the graph was indeed
+         * least get the those messages. If the graph was indeed
          * interrupted there should not be another _next() call as the
          * application will tear down the graph. This component class
          * doesn't support restarting after an interruption.