X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;h=19d4da828b67cc793b056a46933d3b332c74b870;hb=refs%2Fheads%2Fstable-2.0;hp=004e60ace8d86771652405c2076f555969bd12d8;hpb=e5757a9047b04cb2fb94d9dfdf7153e963eafa95;p=lttng-ust.git

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 004e60ac..19d4da82 100644
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -2,63 +2,34 @@
 #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.
- */
-
-/*
- * lttng_ust_getprocname.
+ * 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
  */
-#ifdef __linux__
-
-#include <sys/prctl.h>
 
-#define LTTNG_UST_PROCNAME_LEN 17
+#include <sys/syscall.h>
 
+#ifdef __UCLIBC__
+#define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
 static inline
-void lttng_ust_getprocname(char *name)
+int sched_getcpu(void)
 {
-	(void) prctl(PR_GET_NAME, (unsigned long) name, 0, 0, 0);
-}
-
-#elif defined(__FreeBSD__)
-#include <stdlib.h>
-#include <string.h>
-
-/*
- * Limit imposed by Linux UST-sessiond ABI.
- */
-#define LTTNG_UST_PROCNAME_LEN 17
+	int c, s;
 
-/*
- * Acts like linux prctl, the string is not necessarily 0-terminated if
- * 16-byte long.
- */
-static inline
-void lttng_ust_getprocname(char *name)
-{
-	const char *bsd_name;
-
-	bsd_name = getprogname();
-	if (!bsd_name)
-		name[0] = '\0';
-	memcpy(name, bsd_name, LTTNG_UST_PROCNAME_LEN - 1);
+	s = __getcpu(&c, NULL, NULL);
+	return (s == -1) ? s : c;
 }
-
-#endif
-
-#include <errno.h>
-
-#ifndef ENODATA
-#define ENODATA	ENOMSG
-#endif
-
+#endif	/* __UCLIBC__ */
 #endif /* _UST_COMPAT_H */