libjansson replaced to rapidjson.

Sync changes with proxy.

src/log/ConsoleLog.cpp

@@ -23,6 +23,7 @@
 
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -38,13 +39,16 @@
 
 
 ConsoleLog::ConsoleLog(bool colors) :
-    m_colors(colors)
+    m_colors(colors),
+    m_stream(nullptr)
 {
     if (uv_tty_init(uv_default_loop(), &m_tty, 1, 0) < 0) {
         return;
     }
 
     uv_tty_set_mode(&m_tty, UV_TTY_MODE_NORMAL);
+    m_uvBuf.base = m_buf;
+    m_stream     = reinterpret_cast<uv_stream_t*>(&m_tty);
 
 #   ifdef WIN32
     HANDLE handle = GetStdHandle(STD_INPUT_HANDLE);
@@ -99,21 +103,19 @@ void ConsoleLog::message(int level, const char* fmt, va_list args)
         }
     }
 
-    char *buf = new char[64 + strlen(fmt) + 2];
-
-    sprintf(buf, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s\n",
-            stime.tm_year + 1900,
-            stime.tm_mon + 1,
-            stime.tm_mday,
-            stime.tm_hour,
-            stime.tm_min,
-            stime.tm_sec,
-            m_colors ? color : "",
-            fmt,
-            m_colors ? Log::kCL_N : ""
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "[%d-%02d-%02d %02d:%02d:%02d]%s %s%s\n",
+             stime.tm_year + 1900,
+             stime.tm_mon + 1,
+             stime.tm_mday,
+             stime.tm_hour,
+             stime.tm_min,
+             stime.tm_sec,
+             m_colors ? color : "",
+             fmt,
+             m_colors ? Log::kCL_N : ""
         );
 
-    print(buf, args);
+    print(args);
 }
 
 
@@ -123,17 +125,15 @@ void ConsoleLog::text(const char* fmt, va_list args)
         return;
     }
 
-    char *buf = new char[64 + strlen(fmt) + 2];
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s\n", fmt, m_colors ? Log::kCL_N : "");
 
-    sprintf(buf, "%s%s\n", fmt, m_colors ? Log::kCL_N : "");
-
-    print(buf, args);
+    print(args);
 }
 
 
 bool ConsoleLog::isWritable() const
 {
-    if (uv_is_writable(reinterpret_cast<const uv_stream_t*>(&m_tty)) != 1) {
+    if (!m_stream || uv_is_writable(m_stream) != 1) {
         return false;
     }
 
@@ -142,20 +142,12 @@ bool ConsoleLog::isWritable() const
 }
 
 
-void ConsoleLog::print(char *fmt, va_list args)
+void ConsoleLog::print(va_list args)
 {
-    vsnprintf(m_buf, sizeof(m_buf) - 1, fmt, args);
-    delete [] fmt;
+    m_uvBuf.len = vsnprintf(m_buf, sizeof(m_buf) - 1, m_fmt, args);
+    if (m_uvBuf.len <= 0) {
+        return;
+    }
 
-    uv_buf_t buf;
-    buf.base = strdup(m_buf);
-    buf.len  = strlen(buf.base);
-
-    uv_write_t *req = new uv_write_t;
-    req->data = buf.base;
-
-    uv_write(req, reinterpret_cast<uv_stream_t*>(&m_tty), &buf, 1, [](uv_write_t *req, int status) {
-        free(req->data);
-        delete req;
-    });
+    uv_try_write(m_stream, &m_uvBuf, 1);
 }

src/log/ConsoleLog.h

@@ -41,10 +41,13 @@ public:
 
 private:
     bool isWritable() const;
-    void print(char *fmt, va_list args);
+    void print(va_list args);
 
     bool m_colors;
     char m_buf[512];
+    char m_fmt[256];
+    uv_buf_t m_uvBuf;
+    uv_stream_t *m_stream;
     uv_tty_t m_tty;
 };
 

src/log/FileLog.cpp

@@ -23,6 +23,7 @@
 
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -54,7 +55,7 @@ void FileLog::message(int level, const char* fmt, va_list args)
     localtime_r(&now, &stime);
 #   endif
 
-    char *buf = static_cast<char*>(malloc(512));
+    char *buf = new char[512];
     int size = snprintf(buf, 23, "[%d-%02d-%02d %02d:%02d:%02d] ",
                         stime.tm_year + 1900,
                         stime.tm_mon + 1,
@@ -79,17 +80,17 @@ void FileLog::text(const char* fmt, va_list args)
 
 void FileLog::onWrite(uv_fs_t *req)
 {
-    free(req->data);
+    delete [] static_cast<char *>(req->data);
 
     uv_fs_req_cleanup(req);
-    free(req);
+    delete req;
 }
 
 
 void FileLog::write(char *data, size_t size)
 {
     uv_buf_t buf = uv_buf_init(data, (unsigned int) size);
-    uv_fs_t *req = static_cast<uv_fs_t*>(malloc(sizeof(uv_fs_t)));
+    uv_fs_t *req = new uv_fs_t;
     req->data = buf.base;
 
     uv_fs_write(uv_default_loop(), req, m_file, &buf, 1, 0, FileLog::onWrite);

src/log/Log.cpp

@@ -23,6 +23,7 @@
 
 
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>

src/log/Log.h

@@ -57,6 +57,7 @@ public:
     static inline Log* i()                       { return m_self; }
     static inline void add(ILogBackend *backend) { i()->m_backends.push_back(backend); }
     static inline void init()                    { if (!m_self) { m_self = new Log();} }
+    static inline void release()                 { delete m_self; }
 
     void message(Level level, const char* fmt, ...);
     void text(const char* fmt, ...);