mirror of
https://github.com/CTCaer/RetroArch.git
synced 2024-12-22 10:49:02 +00:00
Refactor logger headers
This commit is contained in:
twinaphex
parent
aa1881febf
commit
e00ea900ed
@ -86,8 +86,95 @@ static aslclient asl_client;
|
||||
static int asl_inited = 0;
|
||||
#endif
|
||||
|
||||
#if defined(RARCH_CONSOLE) && defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
|
||||
#include <logger_override.h>
|
||||
#if defined(HAVE_LOGGER) && defined(RARCH_INTERNAL)
|
||||
|
||||
#define BUFSIZE (64 * 1024)
|
||||
#define TCPDUMP_STACKSIZE (16 * 1024)
|
||||
#define TCPDUMP_PRIO (2048)
|
||||
|
||||
void logger_init (void);
|
||||
void logger_shutdown (void);
|
||||
void logger_send (const char *__format,...);
|
||||
void logger_send_v(const char *__format, va_list args);
|
||||
|
||||
#ifdef IS_SALAMANDER
|
||||
|
||||
#define RARCH_LOG(...) do { \
|
||||
logger_send("RetroArch Salamander: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT(...) do { \
|
||||
logger_send("RetroArch Salamander [OUTPUT] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [OUTPUT] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_ERR(...) do { \
|
||||
logger_send("RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_ERR_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [ERROR] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_WARN(...) do { \
|
||||
logger_send("RetroArch Salamander [WARN] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_WARN_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [WARN] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#else
|
||||
|
||||
#define RARCH_LOG(...) do { \
|
||||
logger_send("RetroArch: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_ERR(...) do { \
|
||||
logger_send("RetroArch [ERROR] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_ERR_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [ERROR] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_WARN(...) do { \
|
||||
logger_send("RetroArch [WARN] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_WARN_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [WARN] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT(...) do { \
|
||||
logger_send("RetroArch [OUTPUT] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [OUTPUT] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
|
||||
#else
|
||||
static INLINE void RARCH_LOG_V(const char *tag, const char *fmt, va_list ap)
|
||||
{
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
#include <retro_miscellaneous.h>
|
||||
#include <net/net_compat.h>
|
||||
|
||||
#include "logger.h"
|
||||
#include <retro_log.h>
|
||||
|
||||
#if !defined(PC_DEVELOPMENT_IP_ADDRESS)
|
||||
#error "An IP address for the PC logging server was not set in the Makefile, cannot continue."
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
/* RetroArch - A frontend for libretro.
|
||||
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2015 - Daniel De Matteis
|
||||
*
|
||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* RetroArch 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 RetroArch.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _LOGGER_H_
|
||||
#define _LOGGER_H_
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
#define BUFSIZE (64 * 1024)
|
||||
#define TCPDUMP_STACKSIZE (16 * 1024)
|
||||
#define TCPDUMP_PRIO (2048)
|
||||
|
||||
void logger_init (void);
|
||||
void logger_shutdown (void);
|
||||
void logger_send (const char *__format,...);
|
||||
void logger_send_v(const char *__format, va_list args);
|
||||
|
||||
#endif
|
||||
@ -1,102 +0,0 @@
|
||||
/* RetroArch - A frontend for libretro.
|
||||
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
|
||||
* Copyright (C) 2011-2015 - Daniel De Matteis
|
||||
*
|
||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
* * RetroArch 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 RetroArch.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __RARCH_LOGGER_OVERRIDE_H
|
||||
#define __RARCH_LOGGER_OVERRIDE_H
|
||||
|
||||
#if defined(HAVE_LOGGER)
|
||||
#include "logger.h"
|
||||
|
||||
#ifdef IS_SALAMANDER
|
||||
|
||||
#define RARCH_LOG(...) do { \
|
||||
logger_send("RetroArch Salamander: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT(...) do { \
|
||||
logger_send("RetroArch Salamander [OUTPUT] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [OUTPUT] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_ERR(...) do { \
|
||||
logger_send("RetroArch Salamander [ERROR] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_ERR_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [ERROR] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_WARN(...) do { \
|
||||
logger_send("RetroArch Salamander [WARN] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_WARN_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch Salamander [WARN] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#else
|
||||
|
||||
#define RARCH_LOG(...) do { \
|
||||
logger_send("RetroArch: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_ERR(...) do { \
|
||||
logger_send("RetroArch [ERROR] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_ERR_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [ERROR] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_WARN(...) do { \
|
||||
logger_send("RetroArch [WARN] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_WARN_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [WARN] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT(...) do { \
|
||||
logger_send("RetroArch [OUTPUT] :: " __VA_ARGS__); \
|
||||
} while(0)
|
||||
|
||||
#define RARCH_LOG_OUTPUT_V(tag, fmt, vp) do { \
|
||||
logger_send("RetroArch [OUTPUT] :: " tag); \
|
||||
logger_send_v(fmt, vp); \
|
||||
} while (0)
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user