From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 5 Apr 2012 17:21:08 +0000 (-0400)
Subject: Merge branch 'dev'
X-Git-Tag: v2.1.0-rc1~97
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=9501d22f55b3a23f382f631c99b2325d1419b5da;p=lttng-ust.git

Merge branch 'dev'
---

9501d22f55b3a23f382f631c99b2325d1419b5da
diff --cc liblttng-ust/compat.h
index 19d4da82,004e60ac..58d8585c
--- a/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/lttng-context-procname.c
index caf86a95,b737084b..d165be88
--- a/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 libringbuffer/getcpu.h
index 44d0d559,3474bfe0..0a619417
--- a/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.