Add FuchsiaLogger, taking PosixLogger as the starting point.
(we need to modify the logging so that it doesn't rely on local time)
The added FuchsiaLogger is a verbatim copy of the current `util/posix_logger.h`,
we will modify it from there.
Change-Id: Id612cf3d1a6ef7fb79d49e3ee72c6a5b4d274350
diff --git a/util/env_fuchsia.cc b/util/env_fuchsia.cc
index c75b06c..733c67c 100644
--- a/util/env_fuchsia.cc
+++ b/util/env_fuchsia.cc
@@ -49,12 +49,88 @@
#include "port/port.h"
#include "util/logging.h"
#include "util/mutexlock.h"
-#include "util/posix_logger.h"
namespace leveldb {
namespace {
+class FuchsiaLogger : public Logger {
+ private:
+ FILE* file_;
+ uint64_t (*gettid_)(); // Return the thread id for the current thread
+ public:
+ FuchsiaLogger(FILE* f, uint64_t (*gettid)()) : file_(f), gettid_(gettid) { }
+ virtual ~FuchsiaLogger() {
+ fclose(file_);
+ }
+ virtual void Logv(const char* format, va_list ap) {
+ const uint64_t thread_id = (*gettid_)();
+
+ // We try twice: the first time with a fixed-size stack allocated buffer,
+ // and the second time with a much larger dynamically allocated buffer.
+ char buffer[500];
+ for (int iter = 0; iter < 2; iter++) {
+ char* base;
+ int bufsize;
+ if (iter == 0) {
+ bufsize = sizeof(buffer);
+ base = buffer;
+ } else {
+ bufsize = 30000;
+ base = new char[bufsize];
+ }
+ char* p = base;
+ char* limit = base + bufsize;
+
+ struct timeval now_tv;
+ gettimeofday(&now_tv, NULL);
+ const time_t seconds = now_tv.tv_sec;
+ struct tm t;
+ localtime_r(&seconds, &t);
+ p += snprintf(p, limit - p,
+ "%04d/%02d/%02d-%02d:%02d:%02d.%06d %llx ",
+ t.tm_year + 1900,
+ t.tm_mon + 1,
+ t.tm_mday,
+ t.tm_hour,
+ t.tm_min,
+ t.tm_sec,
+ static_cast<int>(now_tv.tv_usec),
+ static_cast<long long unsigned int>(thread_id));
+
+ // Print the message
+ if (p < limit) {
+ va_list backup_ap;
+ va_copy(backup_ap, ap);
+ p += vsnprintf(p, limit - p, format, backup_ap);
+ va_end(backup_ap);
+ }
+
+ // Truncate to available space if necessary
+ if (p >= limit) {
+ if (iter == 0) {
+ continue; // Try again with larger buffer
+ } else {
+ p = limit - 1;
+ }
+ }
+
+ // Add newline if necessary
+ if (p == base || p[-1] != '\n') {
+ *p++ = '\n';
+ }
+
+ assert(p <= limit);
+ fwrite(base, 1, p - base, file_);
+ fflush(file_);
+ if (base != buffer) {
+ delete[] base;
+ }
+ break;
+ }
+ }
+};
+
static Status IOError(const std::string& context, int err_number) {
return Status::IOError(context, strerror(err_number));
}
@@ -495,7 +571,7 @@
*result = NULL;
return IOError(fname, errno);
} else {
- *result = new PosixLogger(f, &FuchsiaEnv::gettid);
+ *result = new FuchsiaLogger(f, &FuchsiaEnv::gettid);
return Status::OK();
}
}
