Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f95a41 authored by Tom Cherry's avatar Tom Cherry Committed by Gerrit Code Review
Browse files

Merge changes If6e29418,I6d90838e,Ie488f8ac 

* changes:
  logd: create SimpleLogBuffer and implement ChattyLogBuffer in terms of it
  logd: separate Chatty only vs generic LogBufferTests
  logd: move current sequence from LogBufferElement to LogBuffer
parents aa15ef4d 8f613464

logd/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ cc_library_static { 
        "LogStatistics.cpp",

        "LogWhiteBlackList.cpp",

        "LogTags.cpp",

        "SimpleLogBuffer.cpp",

    ],

    logtags: ["event.logtags"],
@@ -128,6 +129,7 @@ cc_defaults { 
    ] + event_flag,



    srcs: [

        "ChattyLogBufferTest.cpp",

        "logd_test.cpp",

        "LogBufferTest.cpp",

    ],

logd/ChattyLogBuffer.cpp

+51 −312

File changed.

Preview size limit exceeded, changes collapsed.

logd/ChattyLogBuffer.h

+6 −35
Original line number Diff line number Diff line
@@ -35,13 +35,12 @@ 
#include "LogTags.h"

#include "LogWhiteBlackList.h"

#include "LogWriter.h"

#include "SimpleLogBuffer.h"

#include "rwlock.h"



typedef std::list<LogBufferElement> LogBufferElementCollection;



class ChattyLogBuffer : public LogBuffer {

    LogBufferElementCollection mLogElements GUARDED_BY(lock_);



class ChattyLogBuffer : public SimpleLogBuffer {

    // watermark of any worst/chatty uid processing

    typedef std::unordered_map<uid_t, LogBufferElementCollection::iterator> LogBufferIteratorMap;

    LogBufferIteratorMap mLastWorst[LOG_ID_MAX] GUARDED_BY(lock_);
@@ -49,48 +48,20 @@ class ChattyLogBuffer : public LogBuffer { 
    typedef std::unordered_map<pid_t, LogBufferElementCollection::iterator> LogBufferPidIteratorMap;

    LogBufferPidIteratorMap mLastWorstPidOfSystem[LOG_ID_MAX] GUARDED_BY(lock_);



    unsigned long mMaxSize[LOG_ID_MAX] GUARDED_BY(lock_);



  public:

    ChattyLogBuffer(LogReaderList* reader_list, LogTags* tags, PruneList* prune,

                    LogStatistics* stats);

    ~ChattyLogBuffer();

    void Init() override;



    int Log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, pid_t tid, const char* msg,

            uint16_t len) override;

    uint64_t FlushTo(

            LogWriter* writer, uint64_t start, pid_t* lastTid,

            const std::function<FlushToResult(const LogBufferElement* element)>& filter) override;



    bool Clear(log_id_t id, uid_t uid = AID_ROOT) override;

    unsigned long GetSize(log_id_t id) override;

    int SetSize(log_id_t id, unsigned long size) override;

  protected:

    bool Prune(log_id_t id, unsigned long pruneRows, uid_t uid) REQUIRES(lock_) override;

    void LogInternal(LogBufferElement&& elem) REQUIRES(lock_) override;



  private:

    void maybePrune(log_id_t id) REQUIRES(lock_);

    void kickMe(LogReaderThread* me, log_id_t id, unsigned long pruneRows) REQUIRES_SHARED(lock_);



    bool prune(log_id_t id, unsigned long pruneRows, uid_t uid = AID_ROOT) REQUIRES(lock_);

    LogBufferElementCollection::iterator erase(LogBufferElementCollection::iterator it,

    LogBufferElementCollection::iterator Erase(LogBufferElementCollection::iterator it,

                                               bool coalesce = false) REQUIRES(lock_);

    bool ShouldLog(log_id_t log_id, const char* msg, uint16_t len);

    void Log(LogBufferElement&& elem) REQUIRES(lock_);



    // Returns an iterator to the oldest element for a given log type, or mLogElements.end() if

    // there are no logs for the given log type. Requires mLogElementsLock to be held.

    LogBufferElementCollection::iterator GetOldest(log_id_t log_id) REQUIRES(lock_);



    LogReaderList* reader_list_;

    LogTags* tags_;

    PruneList* prune_;

    LogStatistics* stats_;



    // Keeps track of the iterator to the oldest log message of a given log type, as an

    // optimization when pruning logs.  Use GetOldest() to retrieve.

    std::optional<LogBufferElementCollection::iterator> oldest_[LOG_ID_MAX];



    RwLock lock_;



    // This always contains a copy of the last message logged, for deduplication.

    std::optional<LogBufferElement> last_logged_elements_[LOG_ID_MAX] GUARDED_BY(lock_);

logd/ChattyLogBufferTest.cpp

0 → 100644
+202 −0

File added.

Preview size limit exceeded, changes collapsed.

logd/LogBuffer.h

+2 −0
Original line number Diff line number Diff line
@@ -53,4 +53,6 @@ class LogBuffer { 
    virtual bool Clear(log_id_t id, uid_t uid) = 0;

    virtual unsigned long GetSize(log_id_t id) = 0;

    virtual int SetSize(log_id_t id, unsigned long size) = 0;



    virtual uint64_t sequence() const = 0;

};
 
 No newline at end of file