mirrors/spdlog
1
0
Fork 0
mirror of https://github.com/gabime/spdlog.git synced 2024-11-15 08:25:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2359 from tiolan/master

Browse Source 
Revert "Merge pull request #2352 from tiolan/topic/android_buffer"
This commit is contained in:
Gabi Melman 2022-05-12 23:24:55 +03:00 committed by GitHub
commit dea6bb1085
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/spdlog/sinks/android_sink.h
View File

@ -15,7 +15,6 @@
#include <mutex> #include <mutex>
#include <string> #include <string>
#include <thread> #include <thread>
#include <type_traits>
#if !defined(SPDLOG_ANDROID_RETRIES) #if !defined(SPDLOG_ANDROID_RETRIES)
#define SPDLOG_ANDROID_RETRIES 2 #define SPDLOG_ANDROID_RETRIES 2
@ -25,15 +24,13 @@ namespace spdlog {
namespace sinks { namespace sinks {
/* /*
* Android sink * Android sink (logging using __android_log_write)
* (logging using __android_log_write or __android_log_buf_write depending on the specified BufferID) * __android_log_write is thread-safe. No lock is needed.
* They are thread-safe. No lock is needed.
*/ */
template<int BufferID> class android_sink : public sink
class android_sink_buf : public sink
{ {
public: public:
explicit android_sink_buf(const std::string &tag = "spdlog", bool use_raw_msg = false) explicit android_sink(const std::string &tag = "spdlog", bool use_raw_msg = false)
: _tag(tag) : _tag(tag)
, _use_raw_msg(use_raw_msg) , _use_raw_msg(use_raw_msg)
{ {
@ -45,12 +42,12 @@ public:
const char *msg_output = (_use_raw_msg ? msg.raw.c_str() : msg.formatted.c_str()); const char *msg_output = (_use_raw_msg ? msg.raw.c_str() : msg.formatted.c_str());
// See system/core/liblog/logger_write.c for explanation of return value // See system/core/liblog/logger_write.c for explanation of return value
int ret = android_log(priority, _tag.c_str(), msg_output); int ret = __android_log_write(priority, _tag.c_str(), msg_output);
int retry_count = 0; int retry_count = 0;
while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES)) while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES))
{ {
details::os::sleep_for_millis(5); details::os::sleep_for_millis(5);
ret = android_log(priority, _tag.c_str(), msg_output); ret = __android_log_write(priority, _tag.c_str(), msg_output);
retry_count++; retry_count++;
} }
@ -63,21 +60,6 @@ public:
void flush() override {} void flush() override {}
private: private:
// There might be liblog versions used, that do not support __android_log_buf_write. So we only compile and link against
// __android_log_buf_write, if user explicitely provides a non-default log buffer. Otherwise, when using the default log buffer, always
// log via __android_log_write.
template<int ID = BufferID, typename... Args>
typename std::enable_if<ID == static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(Args... args)
{
return __android_log_write(std::forward<Args>(args)...);
}
template<int ID = BufferID, typename... Args>
typename std::enable_if<ID != static_cast<int>(log_id::LOG_ID_MAIN), int>::type android_log(Args... args)
{
return __android_log_buf_write(ID, std::forward<Args>(args)...);
}
static android_LogPriority convert_to_android(spdlog::level::level_enum level) static android_LogPriority convert_to_android(spdlog::level::level_enum level)
{ {
switch (level) switch (level)
@ -103,12 +85,6 @@ private:
bool _use_raw_msg; bool _use_raw_msg;
}; };
/**
* Android sink (logging using __android_log_write)
* __android_log_write is thread-safe. No lock is needed.
*/
using android_sink = android_sink_buf<log_id::LOG_ID_MAIN>;
} // namespace sinks } // namespace sinks
} // namespace spdlog } // namespace spdlog