Skip to content

log: refine log function for Android #6721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

log: refine log function for Android #6721

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f844a3
log: refine log function for Android
zhouwg Apr 17, 2024
8b11ef1
fix build issue which reported by github CI system
zhouwg Apr 17, 2024
6a8e2dd
fix build issue which reported by github CI system
zhouwg Apr 17, 2024
8d4e096
fix build issue which reported by github CI system
zhouwg Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions llama.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@
#pragma warning(disable: 4244 4267) // possible loss of data
#endif

#if (defined __ANDROID__) || (defined ANDROID)
#define LLAMA_ATTRIBUTE_FORMAT(...)
#else
#ifdef __GNUC__
#ifdef __MINGW32__
#define LLAMA_ATTRIBUTE_FORMAT(...) __attribute__((format(gnu_printf, __VA_ARGS__)))
Expand All @@ -103,6 +106,7 @@
#else
#define LLAMA_ATTRIBUTE_FORMAT(...)
#endif
#endif

#define LLAMA_MAX_NODES 8192
#define LLAMA_MAX_EXPERTS 60
Expand All @@ -111,14 +115,18 @@
//
// logging
//
#if (defined __ANDROID__) || (defined ANDROID)
extern "C" int __android_log_print(int prio, const char * tag, const char * fmt, ...)
__attribute__((__format__(printf, 3, 4)));
#endif

LLAMA_ATTRIBUTE_FORMAT(2, 3)
static void llama_log_internal (ggml_log_level level, const char* format, ...);
LLAMA_ATTRIBUTE_FORMAT(5, 6)
static void llama_log_internal (ggml_log_level level, const char * file, const char * func, int line, const char * format, ...);
static void llama_log_callback_default(ggml_log_level level, const char * text, void * user_data);

#define LLAMA_LOG_INFO(...) llama_log_internal(GGML_LOG_LEVEL_INFO , __VA_ARGS__)
#define LLAMA_LOG_WARN(...) llama_log_internal(GGML_LOG_LEVEL_WARN , __VA_ARGS__)
#define LLAMA_LOG_ERROR(...) llama_log_internal(GGML_LOG_LEVEL_ERROR, __VA_ARGS__)
#define LLAMA_LOG_INFO(...) llama_log_internal(GGML_LOG_LEVEL_INFO , __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
#define LLAMA_LOG_WARN(...) llama_log_internal(GGML_LOG_LEVEL_WARN , __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)
#define LLAMA_LOG_ERROR(...) llama_log_internal(GGML_LOG_LEVEL_ERROR, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__)

//
// helpers
Expand Down Expand Up @@ -17136,12 +17144,19 @@ void llama_log_set(ggml_log_callback log_callback, void * user_data) {
#endif
}

static void llama_log_internal_v(ggml_log_level level, const char * format, va_list args) {
static void llama_log_internal_v(ggml_log_level level, const char * file, const char * func, int line, const char * format, va_list args) {
va_list args_copy;
va_copy(args_copy, args);
char buffer[128];
int len = vsnprintf(buffer, 128, format, args);
if (len < 128) {
char buffer[1024];

GGML_UNUSED(file);

int len_prefix = snprintf(buffer, 1024, "[%s, %d]: ", func, line); // param file not used in this file
int len = vsnprintf(buffer + len_prefix, 1024 - len_prefix, format, args);
if (len < (1024 - len_prefix)) {
#if (defined __ANDROID__) || (defined ANDROID)
__android_log_print(level, "llama.cpp", "%s", buffer);
#endif
g_state.log_callback(level, buffer, g_state.log_callback_user_data);
} else {
char* buffer2 = new char[len+1];
Expand All @@ -17153,10 +17168,10 @@ static void llama_log_internal_v(ggml_log_level level, const char * format, va_l
va_end(args_copy);
}

static void llama_log_internal(ggml_log_level level, const char * format, ...) {
static void llama_log_internal(ggml_log_level level, const char * file, const char * func, int line, const char * format, ...) {
va_list args;
va_start(args, format);
llama_log_internal_v(level, format, args);
llama_log_internal_v(level, file, func, line, format, args);
va_end(args);
}

Expand Down
Loading