/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * 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, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * 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.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _ERROR_H
#include <string.h>
#include <stdbool.h>
#include <urcu/tls-compat.h>
-#include <time.h>
+#include <common/compat/time.h>
#ifndef _GNU_SOURCE
#error "lttng-tools error.h needs _GNU_SOURCE"
* every time a log is fired.
*/
struct log_time {
- /* Format: 00:00:00.000000 plus NULL byte. */
- char str[16];
+ /* Format: 00:00:00.000000000 plus NULL byte. */
+ char str[19];
};
extern DECLARE_URCU_TLS(struct log_time, error_log_time);
extern int lttng_opt_mi;
/* Error type. */
-enum lttng_error_type {
+enum lttng_error_level {
PRINT_ERR = 0,
PRINT_BUG = 1,
PRINT_WARN = 2,
PRINT_DBG3 = 6,
};
-static inline bool __lttng_print_check_opt(enum lttng_error_type type)
+static inline bool __lttng_print_check_opt(enum lttng_error_level type)
{
/* lttng_opt_mi and lttng_opt_quiet. */
switch (type) {
void lttng_abort_on_error(void);
-static inline void __lttng_print_check_abort(enum lttng_error_type type)
+static inline void __lttng_print_check_abort(enum lttng_error_level type)
{
switch (type) {
case PRINT_DBG3:
/* Three level of debug. Use -v, -vv or -vvv for the levels */
#define _ERRMSG(msg, type, fmt, args...) __lttng_print(type, msg \
" - %s [%ld/%ld]: " fmt " (in %s() at " __FILE__ ":" XSTR(__LINE__) ")\n", \
- log_add_time(), (long) getpid(), (long) gettid(), ## args, __func__)
+ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args, __func__)
+
+#define _ERRMSG_NO_LOC(msg, type, fmt, args...) __lttng_print(type, msg \
+ " - %s [%ld/%ld]: " fmt "\n", \
+ log_add_time(), (long) getpid(), (long) lttng_gettid(), ## args)
#define MSG(fmt, args...) \
__lttng_print(PRINT_MSG, fmt "\n", ## args)
#define BUG(fmt, args...) _ERRMSG("BUG", PRINT_BUG, fmt, ## args)
#define DBG(fmt, args...) _ERRMSG("DEBUG1", PRINT_DBG, fmt, ## args)
+#define DBG_NO_LOC(fmt, args...) _ERRMSG_NO_LOC("DEBUG1", PRINT_DBG, fmt, ## args)
#define DBG2(fmt, args...) _ERRMSG("DEBUG2", PRINT_DBG2, fmt, ## args)
#define DBG3(fmt, args...) _ERRMSG("DEBUG3", PRINT_DBG3, fmt, ## args)
#define LOG(type, fmt, args...) \
#define _PERROR(fmt, args...) _ERRMSG("PERROR", PRINT_ERR, fmt, ## args)
-#if !defined(__linux__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && !defined(_GNU_SOURCE))
/*
* Version using XSI strerror_r.
* the caller. On error, an empty string is returned thus no time will be
* printed in the log.
*/
-const char *log_add_time();
+const char *log_add_time(void);
#endif /* _ERROR_H */