Fix an import issue in fbcode. (#10604)

Summary:
This should fix an import issue detected in meta internal tests.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/10604

Test Plan: Unit Tests.

Reviewed By: hx235

Differential Revision: D39120414

Pulled By: gitbw95

fbshipit-source-id: dbd016d7f47b9f54aab5ea61e8d3cd79734f46af
main
gitbw95 2 years ago committed by Facebook GitHub Bot
parent 7c0838e65e
commit 6cd8133035
  1. 1
      CMakeLists.txt
  2. 2
      TARGETS
  3. 1
      src.mk
  4. 30
      util/stderr_logger.cc
  5. 23
      util/stderr_logger.h

@ -828,6 +828,7 @@ set(SOURCES
util/slice.cc util/slice.cc
util/file_checksum_helper.cc util/file_checksum_helper.cc
util/status.cc util/status.cc
util/stderr_logger.cc
util/string_util.cc util/string_util.cc
util/thread_local.cc util/thread_local.cc
util/threadpool_imp.cc util/threadpool_imp.cc

@ -253,6 +253,7 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
"util/ribbon_config.cc", "util/ribbon_config.cc",
"util/slice.cc", "util/slice.cc",
"util/status.cc", "util/status.cc",
"util/stderr_logger.cc",
"util/string_util.cc", "util/string_util.cc",
"util/thread_local.cc", "util/thread_local.cc",
"util/threadpool_imp.cc", "util/threadpool_imp.cc",
@ -591,6 +592,7 @@ cpp_library_wrapper(name="rocksdb_whole_archive_lib", srcs=[
"util/ribbon_config.cc", "util/ribbon_config.cc",
"util/slice.cc", "util/slice.cc",
"util/status.cc", "util/status.cc",
"util/stderr_logger.cc",
"util/string_util.cc", "util/string_util.cc",
"util/thread_local.cc", "util/thread_local.cc",
"util/threadpool_imp.cc", "util/threadpool_imp.cc",

@ -240,6 +240,7 @@ LIB_SOURCES = \
util/slice.cc \ util/slice.cc \
util/file_checksum_helper.cc \ util/file_checksum_helper.cc \
util/status.cc \ util/status.cc \
util/stderr_logger.cc \
util/string_util.cc \ util/string_util.cc \
util/thread_local.cc \ util/thread_local.cc \
util/threadpool_imp.cc \ util/threadpool_imp.cc \

@ -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

@ -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 // This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
@ -8,7 +9,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include "port/sys_time.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {
@ -19,26 +19,13 @@ class StderrLogger : public Logger {
explicit StderrLogger(const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL) explicit StderrLogger(const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL)
: Logger(log_level) {} : Logger(log_level) {}
~StderrLogger() override;
// Brings overloaded Logv()s into scope so they're not hidden when we override // Brings overloaded Logv()s into scope so they're not hidden when we override
// a subset of them. // a subset of them.
using Logger::Logv; using Logger::Logv;
virtual void Logv(const char* format, va_list ap) override { 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");
}
}; };
} // namespace ROCKSDB_NAMESPACE } // namespace ROCKSDB_NAMESPACE

Loading…
Cancel
Save