tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove calls to Logger.printf.

Browse Source 
GitOrigin-RevId: 3b5452fc4bd705ce5cf98d360247ec0146923e2d
This commit is contained in:
levlam 2018-02-11 17:07:16 +03:00
parent 834fa51b45
commit 6e3cbf42dc
8 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/bench_log.cpp
View File

@ -75,7 +75,7 @@ class FILEWriteBench : public td::Benchmark {
public: public:
std::string get_description() const override { std::string get_description() const override {
return "fprintf (to file, no buf, no flush)"; return "std::fprintf (to file, no buf, no flush)";
} }
void start_up() override { void start_up() override {

2
td/telegram/SequenceDispatcher.cpp
View File

@ -201,7 +201,7 @@ void SequenceDispatcher::timeout_expired() {
} }
CHECK(!parent_.empty()); CHECK(!parent_.empty());
set_timeout_in(1); set_timeout_in(1);
VLOG(DEBUG) << "SequenceDispatcher ready to close"; LOG(DEBUG) << "SequenceDispatcher ready to close";
send_closure(parent_, &Parent::ready_to_close); send_closure(parent_, &Parent::ready_to_close);
} }

2
td/telegram/Td.cpp
View File

@ -3928,7 +3928,7 @@ void Td::hangup_shared() {
} else if (type == ActorIdType) { } else if (type == ActorIdType) {
dec_actor_refcnt(); dec_actor_refcnt();
} else { } else {
LOG(FATAL, "Unknown hangup_shared ") << tag("type", type); LOG(FATAL) << "Unknown hangup_shared of type " << type;
} }
} }

3
tdutils/td/utils/format.h
View File

@ -147,7 +147,8 @@ inline StringBuilder &operator<<(StringBuilder &builder, const Escaped &escaped)
if (c > 31 && c < 127 && c != '"' && c != '\\') { if (c > 31 && c < 127 && c != '"' && c != '\\') {
builder << static_cast<char>(c); builder << static_cast<char>(c);
} else { } else {
builder.printf("\\%03o", c); const char *oct = "01234567";
builder << "\\0" << oct[c >> 6] << oct[(c >> 3) & 7] << oct[c & 7];
} }
} }
return builder; return builder;

16
tdutils/td/utils/logging.cpp
View File

@ -56,12 +56,18 @@ Logger::Logger(LogInterface &log, int log_level, Slice file_name, int line_num,
} }
file_name = file_name.substr(last_slash_ + 1); file_name = file_name.substr(last_slash_ + 1);
printf("[%2d]", log_level); auto thread_id = get_thread_id();
auto tid = get_thread_id();
if (tid != -1) { (*this) << '[';
printf("[t%2d]", tid); if (log_level < 10) {
(*this) << ' ';
} }
(*this) << StringBuilder::FixedDouble(Clocks::system(), 9) << "[" << file_name << ":" << line_num << "]"; (*this) << log_level << '][t';
if (thread_id < 10) {
(*this) << ' ';
}
(*this) << thread_id << ']' << StringBuilder::FixedDouble(Clocks::system(), 9) << "[" << file_name << ":" << line_num
<< "]";
if (tag_ != nullptr && *tag_) { if (tag_ != nullptr && *tag_) {
(*this) << "[#" << Slice(tag_) << "]"; (*this) << "[#" << Slice(tag_) << "]";
} }

4
tdutils/td/utils/logging.h
View File

@ -12,14 +12,14 @@
* Predefined log levels: FATAL, ERROR, WARNING, INFO, DEBUG * Predefined log levels: FATAL, ERROR, WARNING, INFO, DEBUG
* *
* LOG(WARNING) << "Hello world!"; * LOG(WARNING) << "Hello world!";
* LOG(INFO, "Hello %d", 1234) << " world!"; * LOG(INFO) << "Hello " << 1234 << " world!";
* LOG_IF(INFO, condition) << "Hello world if condition!"; * LOG_IF(INFO, condition) << "Hello world if condition!";
* *
* Custom log levels may be defined and used using VLOG: * Custom log levels may be defined and used using VLOG:
* int VERBOSITY_NAME(custom) = VERBOSITY_NAME(WARNING); * int VERBOSITY_NAME(custom) = VERBOSITY_NAME(WARNING);
* VLOG(custom) << "Hello custom world!" * VLOG(custom) << "Hello custom world!"
* *
* LOG(FATAL, "power is off"); * LOG(FATAL) << "Power is off";
* CHECK(condition) <===> LOG_IF(FATAL, !(condition)) * CHECK(condition) <===> LOG_IF(FATAL, !(condition))
*/ */

2
tdutils/td/utils/port/Stat.cpp
View File

@ -64,7 +64,7 @@ Stat fstat(int native_fd) {
struct ::stat buf; struct ::stat buf;
int err = fstat(native_fd, &buf); int err = fstat(native_fd, &buf);
auto fstat_errno = errno; auto fstat_errno = errno;
LOG_IF(FATAL, err < 0) << Status::PosixError(fstat_errno, PSLICE() << "stat of fd " << native_fd << " failed"); LOG_IF(FATAL, err < 0) << Status::PosixError(fstat_errno, PSLICE() << "stat for fd " << native_fd << " failed");
return detail::from_native_stat(buf); return detail::from_native_stat(buf);
} }

2
tdutils/td/utils/port/detail/KQueue.cpp
View File

@ -147,7 +147,7 @@ void KQueue::run(int timeout_ms) {
flags |= Fd::Close; flags |= Fd::Close;
} }
if (event->fflags & EV_ERROR) { if (event->fflags & EV_ERROR) {
LOG(FATAL, "EV_ERROR in kqueue is not supported"); LOG(FATAL) << "EV_ERROR in kqueue is not supported";
} }
VLOG(fd) << "Event [fd:" << event->ident << "] [filter:" << event->filter << "] [udata: " << event->udata << "]"; VLOG(fd) << "Event [fd:" << event->ident << "] [filter:" << event->filter << "] [udata: " << event->udata << "]";
// LOG(WARNING) << "event->ident = " << event->ident << "event->filter = " << event->filter; // LOG(WARNING) << "event->ident = " << event->ident << "event->filter = " << event->filter;