Skip to content

Commit

Permalink
Fix an import issue in fbcode. (facebook#10604)
Browse files Browse the repository at this point in the history
Summary:
This should fix an import issue detected in meta internal tests.

Pull Request resolved: facebook#10604

Test Plan: Unit Tests.

Reviewed By: hx235

Differential Revision: D39120414

Pulled By: gitbw95

fbshipit-source-id: dbd016d7f47b9f54aab5ea61e8d3cd79734f46af
  • Loading branch information
gitbw95 authored and facebook-github-bot committed Aug 30, 2022
1 parent 7c0838e commit 6cd8133
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 18 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,7 @@ set(SOURCES
util/slice.cc
util/file_checksum_helper.cc
util/status.cc
util/stderr_logger.cc
util/string_util.cc
util/thread_local.cc
util/threadpool_imp.cc
Expand Down
2 changes: 2 additions & 0 deletions TARGETS
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,7 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
"util/ribbon_config.cc",
"util/slice.cc",
"util/status.cc",
"util/stderr_logger.cc",
"util/string_util.cc",
"util/thread_local.cc",
"util/threadpool_imp.cc",
Expand Down Expand Up @@ -591,6 +592,7 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
"util/ribbon_config.cc",
"util/slice.cc",
"util/status.cc",
"util/stderr_logger.cc",
"util/string_util.cc",
"util/thread_local.cc",
"util/threadpool_imp.cc",
Expand Down
1 change: 1 addition & 0 deletions src.mk
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ LIB_SOURCES = \
util/slice.cc \
util/file_checksum_helper.cc \
util/status.cc \
util/stderr_logger.cc \
util/string_util.cc \
util/thread_local.cc \
util/threadpool_imp.cc \
Expand Down
30 changes: 30 additions & 0 deletions util/stderr_logger.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
// Copyright (c) Meta Platforms, Inc. and affiliates.
//
// This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory).

#include "util/stderr_logger.h"

#include "port/sys_time.h"

namespace ROCKSDB_NAMESPACE {
StderrLogger::~StderrLogger() {}

void StderrLogger::Logv(const char* format, va_list ap) {
const uint64_t thread_id = Env::Default()->GetThreadID();

port::TimeVal now_tv;
port::GetTimeOfDay(&now_tv, nullptr);
const time_t seconds = now_tv.tv_sec;
struct tm t;
port::LocalTimeR(&seconds, &t);
fprintf(stderr, "%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));

vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
}
} // namespace ROCKSDB_NAMESPACE
23 changes: 5 additions & 18 deletions util/stderr_logger.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Copyright (c) 2016-present, Facebook, Inc. All rights reserved.
// Copyright (c) Meta Platforms, Inc. and affiliates.
//
// This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory).
Expand All @@ -8,7 +9,6 @@
#include <stdarg.h>
#include <stdio.h>

#include "port/sys_time.h"
#include "rocksdb/env.h"

namespace ROCKSDB_NAMESPACE {
Expand All @@ -19,26 +19,13 @@ class StderrLogger : public Logger {
explicit StderrLogger(const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL)
: Logger(log_level) {}

~StderrLogger() override;

// Brings overloaded Logv()s into scope so they're not hidden when we override
// a subset of them.
using Logger::Logv;

virtual void Logv(const char* format, va_list ap) override {
const uint64_t thread_id = Env::Default()->GetThreadID();

port::TimeVal now_tv;
port::GetTimeOfDay(&now_tv, nullptr);
const time_t seconds = now_tv.tv_sec;
struct tm t;
port::LocalTimeR(&seconds, &t);
fprintf(stderr, "%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));

vfprintf(stderr, format, ap);
fprintf(stderr, "\n");
}
virtual void Logv(const char* format, va_list ap) override;
};

} // namespace ROCKSDB_NAMESPACE

0 comments on commit 6cd8133

Please sign in to comment.