X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.h;h=906a6a209b1e63eca442e438fbb76497d1937775;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hp=67c09692f33ddc72d76b6fbea665b8bf97bdee73;hpb=e0c7ec2b3d96dd7ddd9375c5f72239a733d0cf24;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.h b/src/bin/lttng-sessiond/ust-app.h
index 67c09692f..906a6a209 100644
--- a/src/bin/lttng-sessiond/ust-app.h
+++ b/src/bin/lttng-sessiond/ust-app.h
@@ -1,19 +1,18 @@
 /*
  * 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_UST_APP_H 
@@ -24,7 +23,8 @@
 #include "trace-ust.h"
 
 /* lttng-ust supported version. */
-#define UST_APP_MAJOR_VERSION         1
+#define LTTNG_UST_COMM_MAJOR          2	/* comm protocol major version */
+#define UST_APP_MAJOR_VERSION         2 /* UST version supported */
 
 #define UST_APP_EVENT_LIST_SIZE 32
 
@@ -173,6 +173,7 @@ void ust_app_ht_alloc(void);
 struct lttng_ht *ust_app_get_ht(void);
 struct ust_app *ust_app_find_by_pid(pid_t pid);
 int ust_app_validate_version(int sock);
+int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate);
 
 #else /* HAVE_LIBLTTNG_UST_CTL */
 
@@ -333,6 +334,11 @@ int ust_app_validate_version(int sock)
 {
 	return 0;
 }
+static inline
+int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
+{
+	return 0;
+}
 
 #endif /* HAVE_LIBLTTNG_UST_CTL */