Add custom log output support.

javaaiorg · javaaiorg · commit 86dd8545d88c · 2024-04-02T12:40:57.000+08:00
diff --git a/stable-diffusion.cpp b/stable-diffusion.cpp
@@ -108,7 +108,10 @@ void pretty_progress(int step, int steps, float time) {
         }
     }
     progress += "|";
-    printf(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",
+    //printf(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",
+    //       progress.c_str(), step, steps,
+    //       time > 1.0f || time == 0 ? time : (1.0f / time));
+    LOG_DEBUG(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",
            progress.c_str(), step, steps,
            time > 1.0f || time == 0 ? time : (1.0f / time));
     fflush(stdout);  // for linux
diff --git a/util.cpp b/util.cpp
@@ -170,34 +170,56 @@ void set_sd_log_level(SDLogLevel level) {
     log_level = level;
 }
 
+
+void set_sd_log_callback(LOG_CALLBACK lcb) {
+    log_callback = lcb;
+}
+
+
 void log_printf(SDLogLevel level, const char* file, int line, const char* format, ...) {
-    if (level < log_level) {
-        return;
-    }
-    va_list args;
-    va_start(args, format);
-
-    if (level == SDLogLevel::DEBUG) {
-        printf("[DEBUG] %s:%-4d - ", basename(file).c_str(), line);
-        vprintf(format, args);
-        printf("\n");
-        fflush(stdout);
-    } else if (level == SDLogLevel::INFO) {
-        printf("[INFO]  %s:%-4d - ", basename(file).c_str(), line);
-        vprintf(format, args);
-        printf("\n");
-        fflush(stdout);
-    } else if (level == SDLogLevel::WARN) {
-        fprintf(stdout, "[WARN]  %s:%-4d - ", basename(file).c_str(), line);
-        vfprintf(stdout, format, args);
-        fprintf(stdout, "\n");
-        fflush(stdout);
+    
+    
+    LOG_CALLBACK callback_temp = log_callback;
+    if (callback_temp != NULL) {
+
+        va_list args_temp;
+        va_start(args_temp, format);
+        callback_temp(level, file, line, format, args_temp);
+        va_end(args_temp);
+
     } else {
-        fprintf(stderr, "[ERROR] %s:%-4d - ", basename(file).c_str(), line);
-        vfprintf(stderr, format, args);
-        fprintf(stderr, "\n");
-        fflush(stderr);
+        if (level < log_level) {
+            return;
+        }
+        va_list args;
+        va_start(args, format);
+
+
+        if (level == SDLogLevel::DEBUG) {
+            printf("[DEBUG] %s:%-4d - ", basename(file).c_str(), line);
+            vprintf(format, args);
+            printf("\n");
+            fflush(stdout);
+        } else if (level == SDLogLevel::INFO) {
+            printf("[INFO]  %s:%-4d - ", basename(file).c_str(), line);
+            vprintf(format, args);
+            printf("\n");
+            fflush(stdout);
+        } else if (level == SDLogLevel::WARN) {
+            fprintf(stdout, "[WARN]  %s:%-4d - ", basename(file).c_str(), line);
+            vfprintf(stdout, format, args);
+            fprintf(stdout, "\n");
+            fflush(stdout);
+        } else {
+            fprintf(stderr, "[ERROR] %s:%-4d - ", basename(file).c_str(), line);
+            vfprintf(stderr, format, args);
+            fprintf(stderr, "\n");
+            fflush(stderr);
+        }
+
+        va_end(args);
     }
 
-    va_end(args);
+    
+
 }
diff --git a/util.h b/util.h
@@ -32,6 +32,9 @@ enum SDLogLevel {
 };
 
 void set_sd_log_level(SDLogLevel level);
+typedef void (*LOG_CALLBACK)(SDLogLevel level, const char* file, int line, const char* format, va_list args);
+static LOG_CALLBACK log_callback = NULL;
+void set_sd_log_callback(LOG_CALLBACK);
 
 void log_printf(SDLogLevel level, const char* file, int line, const char* format, ...);
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,10 @@ void pretty_progress(int step, int steps, float time) {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`progress += "\|";`
`111`		`- printf(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",`
	`111`	`+ //printf(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",`
	`112`	`+ // progress.c_str(), step, steps,`
	`113`	`+ // time > 1.0f \|\| time == 0 ? time : (1.0f / time));`
	`114`	`+ LOG_DEBUG(time > 1.0f ? "\r%s %i/%i - %.2fs/it" : "\r%s %i/%i - %.2fit/s",`
`112`	`115`	`progress.c_str(), step, steps,`
`113`	`116`	`time > 1.0f \|\| time == 0 ? time : (1.0f / time));`
`114`	`117`	`fflush(stdout); // for linux`