lttng/ust-abi.h \
lttng/ringbuffer-abi.h \
lttng/ust-tracer.h \
- lttng/usterr-signal-safe.h \
lttng/config.h \
lttng/share.h \
lttng/ust.h \
noinst_HEADERS = \
usterr.h \
+ usterr-signal-safe.h \
ust_snprintf.h \
ust-comm.h \
lttng/bitfield.h \
#include <errno.h>
#include "lttng/ust-tracer.h"
-#include "lttng/usterr-signal-safe.h"
#include <stdint.h>
#include <stddef.h>
#include <urcu/arch.h>
#include <stdio.h>
#include <urcu/compiler.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ringbuffer-config.h>
+#include <string.h>
/*
* Macro declarations used for all stages.
+++ /dev/null
-#ifndef _USTERR_SIGNAL_SAFE_H
-#define _USTERR_SIGNAL_SAFE_H
-
-/*
- * Copyright (C) 2009 Pierre-Marc Fournier
- * Copyright (C) 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; 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 <string.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include <lttng/share.h>
-
-enum ust_loglevel {
- UST_LOGLEVEL_UNKNOWN = 0,
- UST_LOGLEVEL_NORMAL,
- UST_LOGLEVEL_DEBUG,
-};
-
-extern volatile enum ust_loglevel ust_loglevel;
-void init_usterr(void);
-
-static inline int ust_debug(void)
-{
- return ust_loglevel == UST_LOGLEVEL_DEBUG;
-}
-
-#ifndef UST_COMPONENT
-//#error UST_COMPONENT is undefined
-#define UST_COMPONENT libust
-#endif
-
-/* To stringify the expansion of a define */
-#define UST_XSTR(d) UST_STR(d)
-#define UST_STR(s) #s
-
-#define USTERR_MAX_LEN 512
-
-/* We sometimes print in the tracing path, and tracing can occur in
- * signal handlers, so we must use a print method which is signal safe.
- */
-
-extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
-
-static inline void __attribute__ ((format (printf, 1, 2)))
- __check_ust_safe_fmt(const char *fmt, ...)
-{
-}
-
-/* Can't use dynamic allocation. Limit ourselves to USTERR_MAX_LEN chars. */
-/* Add end of string in case of buffer overflow. */
-#define sigsafe_print_err(fmt, args...) \
-do { \
- char ____buf[USTERR_MAX_LEN]; \
- int ____saved_errno; \
- ____saved_errno = errno; /* signal-safety */ \
- ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
- ____buf[sizeof(____buf) - 1] = 0; \
- patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
- errno = ____saved_errno; /* signal-safety */ \
-} while (0)
-
-#define UST_STR_COMPONENT UST_XSTR(UST_COMPONENT)
-
-#define ERRMSG(fmt, args...) \
- do { \
- sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
- (long) getpid(), \
- (long) syscall(SYS_gettid), \
- ## args, __func__); \
- fflush(stderr); \
- } while(0)
-
-#ifdef LTTNG_UST_DEBUG
-# define DBG(fmt, args...) ERRMSG(fmt, ## args)
-# define DBG_raw(fmt, args...) \
- do { \
- sigsafe_print_err(fmt, ## args); \
- fflush(stderr); \
- } while(0)
-#else
-# define DBG(fmt, args...) \
- do { \
- if (ust_debug()) \
- ERRMSG(fmt, ## args); \
- } while (0)
-# define DBG_raw(fmt, args...) \
- do { \
- if (ust_debug()) { \
- sigsafe_print_err(fmt, ## args); \
- fflush(stderr); \
- } \
- } while(0)
-#endif
-#define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
-#define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
-#define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
-
-#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
-#define PERROR(call, args...)\
- do { \
- char buf[200] = "Error in strerror_r()"; \
- strerror_r(errno, buf, sizeof(buf)); \
- ERRMSG("Error: " call ": %s", ## args, buf); \
- } while(0);
-#else
-#define PERROR(call, args...)\
- do { \
- char *buf; \
- char tmp[200]; \
- buf = strerror_r(errno, tmp, sizeof(tmp)); \
- ERRMSG("Error: " call ": %s", ## args, buf); \
- } while(0);
-#endif
-
-#define BUG_ON(condition) \
- do { \
- if (caa_unlikely(condition)) \
- ERR("condition not respected (BUG) on line %s:%d", __FILE__, __LINE__); \
- } while(0)
-#define WARN_ON(condition) \
- do { \
- if (caa_unlikely(condition)) \
- WARN("condition not respected on line %s:%d", __FILE__, __LINE__); \
- } while(0)
-#define WARN_ON_ONCE(condition) WARN_ON(condition)
-
-#endif /* _USTERR_SIGNAL_SAFE_H */
--- /dev/null
+#ifndef _USTERR_SIGNAL_SAFE_H
+#define _USTERR_SIGNAL_SAFE_H
+
+/*
+ * Copyright (C) 2009 Pierre-Marc Fournier
+ * Copyright (C) 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; 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 <string.h>
+#include <sys/types.h>
+#include <sys/syscall.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include <lttng/share.h>
+
+enum ust_loglevel {
+ UST_LOGLEVEL_UNKNOWN = 0,
+ UST_LOGLEVEL_NORMAL,
+ UST_LOGLEVEL_DEBUG,
+};
+
+extern volatile enum ust_loglevel ust_loglevel;
+void init_usterr(void);
+
+static inline int ust_debug(void)
+{
+ return ust_loglevel == UST_LOGLEVEL_DEBUG;
+}
+
+#ifndef UST_COMPONENT
+//#error UST_COMPONENT is undefined
+#define UST_COMPONENT libust
+#endif
+
+/* To stringify the expansion of a define */
+#define UST_XSTR(d) UST_STR(d)
+#define UST_STR(s) #s
+
+#define USTERR_MAX_LEN 512
+
+/* We sometimes print in the tracing path, and tracing can occur in
+ * signal handlers, so we must use a print method which is signal safe.
+ */
+
+extern int ust_safe_snprintf(char *str, size_t n, const char *fmt, ...)
+ __attribute__ ((format (printf, 3, 4)));
+
+static inline void __attribute__ ((format (printf, 1, 2)))
+ __check_ust_safe_fmt(const char *fmt, ...)
+{
+}
+
+/* Can't use dynamic allocation. Limit ourselves to USTERR_MAX_LEN chars. */
+/* Add end of string in case of buffer overflow. */
+#define sigsafe_print_err(fmt, args...) \
+do { \
+ char ____buf[USTERR_MAX_LEN]; \
+ int ____saved_errno; \
+ ____saved_errno = errno; /* signal-safety */ \
+ ust_safe_snprintf(____buf, sizeof(____buf), fmt, ## args); \
+ ____buf[sizeof(____buf) - 1] = 0; \
+ patient_write(STDERR_FILENO, ____buf, strlen(____buf)); \
+ errno = ____saved_errno; /* signal-safety */ \
+} while (0)
+
+#define UST_STR_COMPONENT UST_XSTR(UST_COMPONENT)
+
+#define ERRMSG(fmt, args...) \
+ do { \
+ sigsafe_print_err(UST_STR_COMPONENT "[%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" UST_XSTR(__LINE__) ")\n", \
+ (long) getpid(), \
+ (long) syscall(SYS_gettid), \
+ ## args, __func__); \
+ fflush(stderr); \
+ } while(0)
+
+#ifdef LTTNG_UST_DEBUG
+# define DBG(fmt, args...) ERRMSG(fmt, ## args)
+# define DBG_raw(fmt, args...) \
+ do { \
+ sigsafe_print_err(fmt, ## args); \
+ fflush(stderr); \
+ } while(0)
+#else
+# define DBG(fmt, args...) \
+ do { \
+ if (ust_debug()) \
+ ERRMSG(fmt, ## args); \
+ } while (0)
+# define DBG_raw(fmt, args...) \
+ do { \
+ if (ust_debug()) { \
+ sigsafe_print_err(fmt, ## args); \
+ fflush(stderr); \
+ } \
+ } while(0)
+#endif
+#define WARN(fmt, args...) ERRMSG("Warning: " fmt, ## args)
+#define ERR(fmt, args...) ERRMSG("Error: " fmt, ## args)
+#define BUG(fmt, args...) ERRMSG("BUG: " fmt, ## args)
+
+#if (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE)
+#define PERROR(call, args...)\
+ do { \
+ char buf[200] = "Error in strerror_r()"; \
+ strerror_r(errno, buf, sizeof(buf)); \
+ ERRMSG("Error: " call ": %s", ## args, buf); \
+ } while(0);
+#else
+#define PERROR(call, args...)\
+ do { \
+ char *buf; \
+ char tmp[200]; \
+ buf = strerror_r(errno, tmp, sizeof(tmp)); \
+ ERRMSG("Error: " call ": %s", ## args, buf); \
+ } while(0);
+#endif
+
+#define BUG_ON(condition) \
+ do { \
+ if (caa_unlikely(condition)) \
+ ERR("condition not respected (BUG) on line %s:%d", __FILE__, __LINE__); \
+ } while(0)
+#define WARN_ON(condition) \
+ do { \
+ if (caa_unlikely(condition)) \
+ WARN("condition not respected on line %s:%d", __FILE__, __LINE__); \
+ } while(0)
+#define WARN_ON_ONCE(condition) WARN_ON(condition)
+
+#endif /* _USTERR_SIGNAL_SAFE_H */
#include <string.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-events.h>
#include <sys/mman.h>
+
+#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include "../libringbuffer/backend.h"
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
-#include <urcu-bp.h>
-#include <urcu/compiler.h>
-#include <urcu/uatomic.h>
#include <uuid/uuid.h>
-#include <lttng/tracepoint.h>
#include <errno.h>
#include <sys/shm.h>
#include <sys/ipc.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <urcu-bp.h>
+#include <urcu/compiler.h>
+#include <urcu/uatomic.h>
+#include <urcu/arch.h>
+
+#include <lttng/tracepoint.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
+
+#include <usterr-signal-safe.h>
+#include <helper.h>
+
#include "ltt-tracer.h"
#include "ltt-tracer-core.h"
#include "wait.h"
#include "../libringbuffer/shm.h"
-#include <stdint.h>
-#include <stddef.h>
-#include <urcu/arch.h>
#include "jhash.h"
-#include <helper.h>
/*
* The sessions mutex is the centralized mutex across UST tracing
#include <stdint.h>
#include <stddef.h>
#include <urcu/arch.h>
-#include <lttng/ust-tracer.h>
#include <urcu/list.h>
-#include <lttng/usterr-signal-safe.h>
-#include "lttng/bug.h"
-
+#include <lttng/ust-tracer.h>
+#include <lttng/bug.h>
#include <lttng/ringbuffer-config.h>
+#include <usterr-signal-safe.h>
struct ltt_session;
struct ltt_channel;
#include <urcu/compiler.h>
#include <urcu/list.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-version.h>
+#include <usterr-signal-safe.h>
+#include <helper.h>
#include "ltt-tracer.h"
#include "tracepoint-internal.h"
-#include <helper.h>
struct ltt_tracepoint_list {
struct tracepoint_iter iter;
#include <urcu/uatomic.h>
#include <urcu/futex.h>
-#include <ust-comm.h>
#include <lttng/ust-events.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ust-abi.h>
-#include "tracepoint-internal.h"
#include <lttng/ust.h>
+#include <ust-comm.h>
+#include <usterr-signal-safe.h>
+#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
/*
#define _LGPL_SOURCE
#include <errno.h>
-#include <lttng/tracepoint.h>
#include <stdint.h>
#include <stddef.h>
+
#include <urcu/arch.h>
#include <urcu-bp.h>
#include <urcu/hlist.h>
#include <urcu/uatomic.h>
#include <urcu/compiler.h>
+
+#include <lttng/tracepoint.h>
+
+#include <usterr-signal-safe.h>
#include <helper.h>
-#include <lttng/usterr-signal-safe.h>
#include "tracepoint-internal.h"
#include "ltt-tracer-core.h"
#include "jhash.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <lttng/usterr-signal-safe.h>
-#include <lttng/ust-events.h>
#include <stdlib.h>
+#include <lttng/ust-events.h>
+#include <usterr-signal-safe.h>
static CDS_LIST_HEAD(ltt_transport_list);
#include <urcu/list.h>
#include <urcu/uatomic.h>
-#include <lttng/usterr-signal-safe.h>
#include <lttng/ringbuffer-config.h>
+#include <usterr-signal-safe.h>
#include "backend_types.h"
#include "shm_internal.h"
#include "vatomic.h"
*/
#include <stdint.h>
-#include <lttng/usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
#include <urcu/compiler.h>
#include "shm_types.h"
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <lttng/usterr-signal-safe.h>
+#include <usterr-signal-safe.h>
volatile enum ust_loglevel ust_loglevel;
projects / lttng-ust.git / commitdiff
