Merge branch 'dev'

diff --cc README
Simple merge

diff --cc configure.ac
Simple merge

diff --cc include/lttng/ust-events.h
Simple merge

diff --cc liblttng-ust/compat.h
index 19d4da828b67cc793b056a46933d3b332c74b870,004e60ace8d86771652405c2076f555969bd12d8..58d8585c4823eb16c7343d256777d770f6773100
--- 1/liblttng-ust/compat.h
--- 2/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@@ -2,34 -2,63 +2,68 @@@
  #define _UST_COMPAT_H
  
  /*
 - * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 + * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
   *
 - * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
 - * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
 + * This library is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; only
 + * version 2.1 of the License.
   *
 - * Permission is hereby granted to use or copy this program
 - * for any purpose,  provided the above notices are retained on all copies.
 - * Permission to modify the code and to distribute modified code is granted,
 - * provided the above notices are retained, and a notice that the code was
 - * modified is included with the above copyright notice.
 + * This library 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
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with this library; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #include <sys/syscall.h>
+ /*
+  * lttng_ust_getprocname.
+  */
+ #ifdef __linux__
+ 
+ #include <sys/prctl.h>
+ 
+ #define LTTNG_UST_PROCNAME_LEN 17
+ 
+ static inline
+ void lttng_ust_getprocname(char *name)
+ {
+       (void) prctl(PR_GET_NAME, (unsigned long) name, 0, 0, 0);
+ }
+ 
+ #elif defined(__FreeBSD__)
+ #include <stdlib.h>
+ #include <string.h>
  
- #ifdef __UCLIBC__
- #define __getcpu(cpu, node, cache)    syscall(__NR_getcpu, cpu, node, cache)
+ /*
+  * Limit imposed by Linux UST-sessiond ABI.
+  */
+ #define LTTNG_UST_PROCNAME_LEN 17
+ 
+ /*
+  * Acts like linux prctl, the string is not necessarily 0-terminated if
+  * 16-byte long.
+  */
  static inline
- int sched_getcpu(void)
+ void lttng_ust_getprocname(char *name)
  {
-       int c, s;
+       const char *bsd_name;
  
-       s = __getcpu(&c, NULL, NULL);
-       return (s == -1) ? s : c;
+       bsd_name = getprogname();
+       if (!bsd_name)
+               name[0] = '\0';
+       memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
  }
- #endif        /* __UCLIBC__ */
+ 
+ #endif
+ 
+ #include <errno.h>
+ 
+ #ifndef ENODATA
+ #define ENODATA       ENOMSG
+ #endif
+ 
  #endif /* _UST_COMPAT_H */

diff --cc liblttng-ust/ltt-events.c
Simple merge

diff --cc liblttng-ust/ltt-ring-buffer-client.h
Simple merge

diff --cc liblttng-ust/ltt-ring-buffer-metadata-client.h
Simple merge

diff --cc liblttng-ust/lttng-context-procname.c
index caf86a95b65a509cb650e43a8c2ce10691d31dee,b737084bf69aae013cee43c11e7ffa3484067ce5..d165be88277daada8bbb616c2db60572050f9aa2
--- 1/liblttng-ust/lttng-context-procname.c
--- 2/liblttng-ust/lttng-context-procname.c
+++ b/liblttng-ust/lttng-context-procname.c
@@@ -3,24 -4,9 +3,23 @@@
   *
   * LTTng UST procname context.
   *
 - * Dual LGPL v2.1/GPL v2 license.
 + * Copyright (C) 2009-2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 + *
 + * This library is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
 + * License as published by the Free Software Foundation; only
 + * version 2.1 of the License.
 + *
 + * This library 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
 + * Lesser General Public License for more details.
 + *
 + * You should have received a copy of the GNU Lesser General Public
 + * License along with this library; if not, write to the Free Software
 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
- #include <sys/prctl.h>
  #include <lttng/ust-events.h>
  #include <lttng/ust-tracer.h>
  #include <lttng/ringbuffer-config.h>

diff --cc liblttng-ust/lttng-context-vtid.c
Simple merge

diff --cc liblttng-ust/lttng-ust-comm.c
Simple merge

diff --cc libringbuffer/backend_internal.h
Simple merge

diff --cc libringbuffer/getcpu.h
index 44d0d5594f04641029bb70116d6784b8f8ef0ff0,3474bfe0c04f9f218eac190b001b08600f9d8272..0a61941728a5de814ca5e5339d30fa945d3ed9fc
--- 1/libringbuffer/getcpu.h
--- 2/libringbuffer/getcpu.h
+++ b/libringbuffer/getcpu.h
@@@ -20,9 -20,8 +20,8 @@@
   */
  
  #include <urcu/compiler.h>
- #include <sched.h>
  
 -#ifdef UST_VALGRIND
 +#ifdef LTTNG_UST_DEBUG_VALGRIND
  
  /*
   * Fallback on cpu 0 if liblttng-ust is build with Valgrind support.

diff --cc libringbuffer/ring_buffer_frontend.c
Simple merge

diff --cc libringbuffer/shm.c
Simple merge

diff --cc tests/ust-basic-tracing/ust-basic-tracing.c
Simple merge

diff --cc tests/ust-multi-test/ust-multi-test.c
Simple merge