Loading include/log/logger.h +11 −11 Original line number Original line Diff line number Diff line Loading @@ -7,8 +7,8 @@ ** General Public License. ** General Public License. */ */ #ifndef _UTILS_LOGGER_H #ifndef _LIBS_LOG_LOGGER_H #define _UTILS_LOGGER_H #define _LIBS_LOG_LOGGER_H #include <stdint.h> #include <stdint.h> #include <log/log.h> #include <log/log.h> Loading Loading @@ -77,36 +77,36 @@ struct log_msg { } extra; } extra; } __attribute__((aligned(4))); } __attribute__((aligned(4))); #ifdef __cplusplus #ifdef __cplusplus /* Matching log_time_t operators */ /* Matching log_time operators */ bool operator== (log_msg &T) bool operator== (const log_msg &T) const { { return (entry.sec == T.entry.sec) && (entry.nsec == T.entry.nsec); return (entry.sec == T.entry.sec) && (entry.nsec == T.entry.nsec); } } bool operator!= (log_msg &T) bool operator!= (const log_msg &T) const { { return !(*this == T); return !(*this == T); } } bool operator< (log_msg &T) bool operator< (const log_msg &T) const { { return (entry.sec < T.entry.sec) return (entry.sec < T.entry.sec) || ((entry.sec == T.entry.sec) || ((entry.sec == T.entry.sec) && (entry.nsec < T.entry.nsec)); && (entry.nsec < T.entry.nsec)); } } bool operator>= (log_msg &T) bool operator>= (const log_msg &T) const { { return !(*this < T); return !(*this < T); } } bool operator> (log_msg &T) bool operator> (const log_msg &T) const { { return (entry.sec > T.entry.sec) return (entry.sec > T.entry.sec) || ((entry.sec == T.entry.sec) || ((entry.sec == T.entry.sec) && (entry.nsec > T.entry.nsec)); && (entry.nsec > T.entry.nsec)); } } bool operator<= (log_msg &T) bool operator<= (const log_msg &T) const { { return !(*this > T); return !(*this > T); } } uint64_t nsec(void) uint64_t nsec(void) const { { return static_cast<uint64_t>(entry.sec) * NS_PER_SEC + entry.nsec; return static_cast<uint64_t>(entry.sec) * NS_PER_SEC + entry.nsec; } } Loading Loading @@ -167,4 +167,4 @@ const char *android_log_id_to_name(log_id_t log_id); } } #endif #endif #endif /* _UTILS_LOGGER_H */ #endif /* _LIBS_LOG_LOGGER_H */ Loading
include/log/logger.h +11 −11 Original line number Original line Diff line number Diff line Loading @@ -7,8 +7,8 @@ ** General Public License. ** General Public License. */ */ #ifndef _UTILS_LOGGER_H #ifndef _LIBS_LOG_LOGGER_H #define _UTILS_LOGGER_H #define _LIBS_LOG_LOGGER_H #include <stdint.h> #include <stdint.h> #include <log/log.h> #include <log/log.h> Loading Loading @@ -77,36 +77,36 @@ struct log_msg { } extra; } extra; } __attribute__((aligned(4))); } __attribute__((aligned(4))); #ifdef __cplusplus #ifdef __cplusplus /* Matching log_time_t operators */ /* Matching log_time operators */ bool operator== (log_msg &T) bool operator== (const log_msg &T) const { { return (entry.sec == T.entry.sec) && (entry.nsec == T.entry.nsec); return (entry.sec == T.entry.sec) && (entry.nsec == T.entry.nsec); } } bool operator!= (log_msg &T) bool operator!= (const log_msg &T) const { { return !(*this == T); return !(*this == T); } } bool operator< (log_msg &T) bool operator< (const log_msg &T) const { { return (entry.sec < T.entry.sec) return (entry.sec < T.entry.sec) || ((entry.sec == T.entry.sec) || ((entry.sec == T.entry.sec) && (entry.nsec < T.entry.nsec)); && (entry.nsec < T.entry.nsec)); } } bool operator>= (log_msg &T) bool operator>= (const log_msg &T) const { { return !(*this < T); return !(*this < T); } } bool operator> (log_msg &T) bool operator> (const log_msg &T) const { { return (entry.sec > T.entry.sec) return (entry.sec > T.entry.sec) || ((entry.sec == T.entry.sec) || ((entry.sec == T.entry.sec) && (entry.nsec > T.entry.nsec)); && (entry.nsec > T.entry.nsec)); } } bool operator<= (log_msg &T) bool operator<= (const log_msg &T) const { { return !(*this > T); return !(*this > T); } } uint64_t nsec(void) uint64_t nsec(void) const { { return static_cast<uint64_t>(entry.sec) * NS_PER_SEC + entry.nsec; return static_cast<uint64_t>(entry.sec) * NS_PER_SEC + entry.nsec; } } Loading Loading @@ -167,4 +167,4 @@ const char *android_log_id_to_name(log_id_t log_id); } } #endif #endif #endif /* _UTILS_LOGGER_H */ #endif /* _LIBS_LOG_LOGGER_H */