Add time validation to health check

[lttng-tools.git] / src / bin / lttng-sessiond / trace-kernel.h

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index ae993c8d98df22a49c8d74d079c9f756e3ae2957..bc4c0e763bfaa8c2b1694b0cebb956629ba48cfb 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -1,30 +1,30 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program 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 General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _LTT_TRACE_KERNEL_H
 #define _LTT_TRACE_KERNEL_H
 
-#include <limits.h>
 #include <urcu/list.h>
 
 #include <lttng/lttng.h>
 #include <common/lttng-kernel.h>
 
+#include "consumer.h"
+
 /* Kernel event list */
 struct ltt_kernel_event_list {
        struct cds_list_head head;
@@ -57,7 +57,6 @@ struct ltt_kernel_event {
 struct ltt_kernel_channel {
        int fd;
        int enabled;
-       char *pathname;
        unsigned int stream_count;
        unsigned int event_count;
        /*
@@ -74,15 +73,15 @@ struct ltt_kernel_channel {
 /* Metadata */
 struct ltt_kernel_metadata {
        int fd;
-       char *pathname;
        struct lttng_channel *conf;
 };
 
 /* Channel stream */
 struct ltt_kernel_stream {
        int fd;
-       char *pathname;
        int state;
+       /* Format is %s_%d respectively channel name and CPU number. */
+       char name[LTTNG_SYMBOL_NAME_LEN];
        struct cds_list_head list;
 };
 
@@ -100,6 +99,14 @@ struct ltt_kernel_session {
        /* UID/GID of the user owning the session */
        uid_t uid;
        gid_t gid;
+       /*
+        * Two consumer_output object are needed where one is needed for the
+        * current output object and the second one is the temporary object used to
+        * store URI being set by the lttng_set_consumer_uri call. Once
+        * lttng_enable_consumer is called, the two pointers are swapped.
+        */
+       struct consumer_output *consumer;
+       struct consumer_output *tmp_consumer;
 };
 
 /*
@@ -117,7 +124,8 @@ struct ltt_kernel_session *trace_kernel_create_session(char *path);
 struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path);
 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path);
-struct ltt_kernel_stream *trace_kernel_create_stream(void);
+struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
+               unsigned int count);
 
 /*
  * Destroy functions free() the data structure and remove from linked list if