From 7501c9ff778e3463efe18658d21b607a57a4a22d Mon Sep 17 00:00:00 2001 From: Nam Tran Date: Tue, 24 Nov 2020 15:05:42 -0600 Subject: [PATCH] remove loguru --- .gitmodules | 3 --- Makefile | 4 ++-- client.cc | 40 +++++++++++++++------------------------- loguru | 1 - 4 files changed, 17 insertions(+), 31 deletions(-) delete mode 160000 loguru diff --git a/.gitmodules b/.gitmodules index fb65026..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "loguru"] - path = loguru - url = https://github.com/emilk/loguru diff --git a/Makefile b/Makefile index b5f0b74..2ee8472 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ target = r CXX = g++ -CXX_FLAGS := -std=c++14 -Iloguru -Wall +CXX_FLAGS := -std=c++14 -Ispdlog/include -Wall LD_FLAGS := -lpthread -ldl # LOGURU_FLAG := -DLOGURU_SCOPE_TIME_PRECISION=9 BUILD := ./build -OBJS := $(BUILD)/client.o $(BUILD)/loguru.o +OBJS := $(BUILD)/client.o all: $(target) diff --git a/client.cc b/client.cc index bf3cfa3..da722f6 100644 --- a/client.cc +++ b/client.cc @@ -13,8 +13,8 @@ #include #include #include -#include "loguru.hpp" #include "channel.h" +#include "spdlog/spdlog.h" const char * HOST = "192.168.30.89"; const uint32_t PORT = 9999; @@ -39,7 +39,7 @@ size_t process_block(char const * ptr, size_t len){ } size_t process_channel(char const * ptr, size_t len){ if ((len < MIN_CHANNEL_SIZE) || (len > MAX_CHANNEL_SIZE)) { - LOG_SCOPE_F(WARNING, "channel length must be between %lu and %lu.", + spdlog::info("channel length must be between %lu and %lu.", MIN_CHANNEL_SIZE, MAX_CHANNEL_SIZE); return len; } @@ -50,7 +50,7 @@ size_t process_channel(char const * ptr, size_t len){ while ((bytes_left > 0) && !valid_channel) { if ((ptr[0] & 0xFF) != CHANNEL_MARKER){ - LOG_SCOPE_F(WARNING, "bad_data, expecting %02X, received %02X", + spdlog::info("bad_data, expecting %02X, received %02X", static_cast(CHANNEL_MARKER), static_cast(ptr[0])); bytes_left -= 4; } else { @@ -58,28 +58,28 @@ size_t process_channel(char const * ptr, size_t len){ size_t channel_size = ((wordData[0] & 0xFFFFFF00) >> 8) * sizeof(uint32_t); if ((channel_size > MAX_CHANNEL_SIZE) || (channel_size < MIN_CHANNEL_SIZE)) { - LOG_SCOPE_F(WARNING, "Invalid channel size: %lu", channel_size); + spdlog::info("Invalid channel size: %lu", channel_size); } uint32_t version = wordData[0] && 0xFF; - LOG_SCOPE_F(INFO, "channel size %lu, version %u", channel_size, version); + spdlog::info("channel size %lu, version %u", channel_size, version); int32_t integral[3]; for (int i = 0; i < 3; i++) integral[i] = (wordData[i + 1] & 0xFFFFFF00)>>8; - LOG_SCOPE_F(INFO, "integrals: %d, %d, %d", integral[0], integral[1], integral[2]); + spdlog::info("integrals: %d, %d, %d", integral[0], integral[1], integral[2]); uint32_t crossing_count = wordData[4] & 0x00FFFFFF; uint32_t block_count = (wordData[5] &0xFF000000) >> 24; uint32_t channel = (wordData[5] & 0x00FF0000) >> 16; uint32_t spill_id = (wordData[5] & 0x0000FFFF); - LOG_SCOPE_F(INFO, "crossing_count %u, block_count %u, channel %u, spill_id %u", + spdlog::info("crossing_count %u, block_count %u, channel %u, spill_id %u", crossing_count, block_count, channel, spill_id); for (uint32_t i = 0; i < block_count; i++) { process_block(ptr, channel_size); // not correct yet! } - // the number of bytes cosumed by this function, regardless of block + // the number of bytes consumed by this function, regardless of block // processing bytes_left -= channel_size; @@ -89,7 +89,7 @@ size_t process_channel(char const * ptr, size_t len){ } // return number of bytes cosumed of the channel - LOG_SCOPE_F(INFO, "processed %lu bytes out of %lu", (len - bytes_left), len); + spdlog::info("processed %lu bytes out of %lu", (len - bytes_left), len); return len - bytes_left; } @@ -97,7 +97,6 @@ size_t process_channel(char const * ptr, size_t len){ int main(int argc, char * argv[]) { setup_logger(); - loguru::init(argc, argv); signal(SIGINT, signalHandler); int ret = open_socket(); if (ret != 0) @@ -124,7 +123,7 @@ int main(int argc, char * argv[]) else{ // read in first 4 bytes nread = recv(sock, char_buffer, 4, 0); - LOG_F(INFO, "read in %ld bytes: 0x%08X", nread, wordData[0]); + spdlog::info("read in %ld bytes: 0x%08X", nread, wordData[0]); // if not A5 marker, go to next iteration (read in 4 more bytes) if ((char_buffer[0] & 0xFF) != 0xA5){ bad_data = true; @@ -141,14 +140,14 @@ int main(int argc, char * argv[]) } else { // ok, this seems to be good data - LOG_F(INFO, "next %ld bytes (expecting %lu): %08X %08X %08X %08X", + spdlog::info("next %ld bytes (expecting %lu): %08X %08X %08X %08X", nread, frameSize - 4, wordData[0], wordData[1], wordData[2], wordData[3]); - LOG_F(INFO, "%08X %08X %08X %08X", wordData[4], wordData[5], wordData[6], wordData[7]); + spdlog::info("%08X %08X %08X %08X", wordData[4], wordData[5], wordData[6], wordData[7]); uint8_t board_id = (wordData[0] >> 24) & 0xFF; uint8_t version = wordData[0] & 0xFF; uint16_t spill_id = (wordData[1] & 0x00FFFF00) >> 8; uint8_t channel_count = (wordData[1]) & 0x000000FF; - LOG_F(INFO, "board %u, version %u, spill %u, channel_count %u", + spdlog::info("board %u, version %u, spill %u, channel_count %u", static_cast(board_id), static_cast(version), static_cast(spill_id), @@ -165,7 +164,7 @@ int main(int argc, char * argv[]) bytes_processed += process_channel(char_buffer + 2 * sizeof(uint32_t) + bytes_processed, bytes_left - bytes_processed); } - LOG_F(INFO, "Done, %lu bytes processed.", bytes_processed); + spdlog::info("Done, %lu bytes processed.", bytes_processed); } } @@ -178,7 +177,7 @@ int main(int argc, char * argv[]) } void signalHandler( int signum ) { - RAW_LOG_F(WARNING, "Interrupt signal (%d) received, exiting...", signum); + spdlog::info("Interrupt signal (%d) received, exiting...", signum); running = false; } @@ -207,13 +206,4 @@ int open_socket(){ } void setup_logger(){ - // loguru::g_stderr_verbosity = loguru::Verbosity_INFO; - loguru::g_stderr_verbosity = loguru::Verbosity_WARNING; - loguru::g_preamble_date = true; // The date field - loguru::g_preamble_time = true; // The time of the current day - loguru::g_preamble_uptime = true; // The time since init call - loguru::g_preamble_thread = false; // The logging thread - loguru::g_preamble_file = false; // The file from which the log originates from - loguru::g_preamble_verbose = false; // The verbosity field - loguru::g_preamble_pipe = false; // The pipe symbol right before the message } diff --git a/loguru b/loguru deleted file mode 160000 index f64f3fc..0000000 --- a/loguru +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f64f3fc088392869142c7b170dbb015c2f79bd5a