Daniele Bartolini 10 rokov pred
rodič
commit
ca909422af
2 zmenil súbory, kde vykonal 11 pridanie a 10 odobranie
  1. 10 9
      src/core/log.cpp
  2. 1 1
      src/core/os.h

+ 10 - 9
src/core/log.cpp

@@ -37,8 +37,8 @@ namespace log_internal
 
 		// Build json message
 		using namespace string_stream;
-		TempAllocator2048 alloc;
-		StringStream json(alloc);
+		TempAllocator4096 ta;
+		StringStream json(ta);
 
 		json << "{\"type\":\"message\",";
 		json << "\"severity\":\"" << stt[sev] << "\",";
@@ -50,7 +50,8 @@ namespace log_internal
 	void logx(LogSeverity::Enum sev, const char* msg, va_list args)
 	{
 		char buf[8192];
-		int len = 0;
+		int len = vsnprintf(buf, sizeof(buf), msg, args);
+		buf[len] = '\0';
 
 #if CROWN_PLATFORM_POSIX
 		#define ANSI_RESET  "\x1b[0m"
@@ -65,15 +66,15 @@ namespace log_internal
 			ANSI_RESET
 		};
 
-		len +=  snprintf(&buf[len], sizeof(buf) - len, stt[sev]);
-		len += vsnprintf(&buf[len], sizeof(buf) - len, msg, args);
-		len +=  snprintf(&buf[len], sizeof(buf) - len, ANSI_RESET);
+		os::log(stt[sev]);
+		os::log(buf);
+		os::log(ANSI_RESET);
 #else
-		len = vsnprintf(&buf[len], sizeof(buf) - len, msg, args);
+		os::log(buf);
 #endif
-		buf[len] = '\0';
+		os::log("\n");
+
 		console_log(buf, sev);
-		os::log(buf);
 	}
 
 	void logx(LogSeverity::Enum sev, const char* msg, ...)

+ 1 - 1
src/core/os.h

@@ -41,7 +41,7 @@ namespace os
 #if CROWN_PLATFORM_ANDROID
 		__android_log_write(ANDROID_LOG_DEBUG, "crown", msg);
 #else
-		puts(msg);
+		fputs(msg, stdout);
 		fflush(stdout);
 #endif
 	}