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

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

Merge "Remove __android_log_event_list and the reader aspect of android_log_event_list"

parents b94c2e52 c2ea6e7c

liblog/include/log/log_event_list.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -109,8 +109,6 @@ int android_log_destroy(android_log_context* ctx); 
/* android_log_list C++ helpers */

/* android_log_list C++ helpers */

extern "C++" {

extern "C++" {

class android_log_event_list {

class android_log_event_list {

  friend class __android_log_event_list;



 private:

 private:

  android_log_context ctx;

  android_log_context ctx;

  int ret;

  int ret;
@@ -122,10 +120,6 @@ class android_log_event_list { 
  explicit android_log_event_list(int tag) : ret(0) {

  explicit android_log_event_list(int tag) : ret(0) {

    ctx = create_android_logger(static_cast<uint32_t>(tag));

    ctx = create_android_logger(static_cast<uint32_t>(tag));

  }

  }

  explicit android_log_event_list(log_msg& log_msg) : ret(0) {

    ctx = create_android_log_parser(log_msg.msg() + sizeof(uint32_t),

                                    log_msg.entry.len - sizeof(uint32_t));

  }

  ~android_log_event_list() {

  ~android_log_event_list() {

    android_log_destroy(&ctx);

    android_log_destroy(&ctx);

  }

  }
@@ -283,13 +277,6 @@ class android_log_event_list { 
    if (retval < 0) ret = retval;

    if (retval < 0) ret = retval;

    return ret >= 0;

    return ret >= 0;

  }

  }



  android_log_list_element read() {

    return android_log_read_next(ctx);

  }

  android_log_list_element peek() {

    return android_log_peek_next(ctx);

  }

};

};

}

}

#endif

#endif

liblog/include/private/android_logger.h

+0 −31
Original line number Original line Diff line number Diff line
@@ -150,37 +150,6 @@ bool __android_logger_valid_buffer_size(unsigned long value); 
/* Retrieve the composed event buffer */

/* Retrieve the composed event buffer */

int android_log_write_list_buffer(android_log_context ctx, const char** msg);

int android_log_write_list_buffer(android_log_context ctx, const char** msg);





#ifdef __cplusplus

#ifdef __class_android_log_event_list_defined

#ifndef __class_android_log_event_list_private_defined

#define __class_android_log_event_list_private_defined

/* android_log_context C++ helpers */

extern "C++" {

class __android_log_event_list : public android_log_event_list {

  __android_log_event_list(const android_log_event_list&) = delete;

  void operator=(const __android_log_event_list&) = delete;



 public:

  explicit __android_log_event_list(int tag) : android_log_event_list(tag) {

  }

  explicit __android_log_event_list(log_msg& log_msg)

      : android_log_event_list(log_msg) {

  }



  operator std::string() {

    if (ret) return std::string("");

    const char* cp = nullptr;

    ssize_t len = android_log_write_list_buffer(ctx, &cp);

    if (len < 0) ret = len;

    if (!cp || (len <= 0)) return std::string("");

    return std::string(cp, len);

  }

};

}

#endif

#endif

#endif



#if defined(__cplusplus)

#if defined(__cplusplus)

}

}

#endif
 
#endif

libstats/include/stats_event_list.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -51,10 +51,6 @@ class stats_event_list { 
    explicit stats_event_list(int tag) : ret(0) {

    explicit stats_event_list(int tag) : ret(0) {

        ctx = create_android_logger(static_cast<uint32_t>(tag));

        ctx = create_android_logger(static_cast<uint32_t>(tag));

    }

    }

    explicit stats_event_list(log_msg& log_msg) : ret(0) {

        ctx = create_android_log_parser(log_msg.msg() + sizeof(uint32_t),

                                        log_msg.entry.len - sizeof(uint32_t));

    }

    ~stats_event_list() { android_log_destroy(&ctx); }

    ~stats_event_list() { android_log_destroy(&ctx); }





    int close() {

    int close() {
@@ -251,9 +247,6 @@ class stats_event_list { 
        }

        }

        return ret >= 0;

        return ret >= 0;

    }

    }



    android_log_list_element read() { return android_log_read_next(ctx); }

    android_log_list_element peek() { return android_log_peek_next(ctx); }

};

};





#endif

#endif

logd/LogTags.cpp

+27 −10
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ 




#include <android-base/file.h>

#include <android-base/file.h>

#include <android-base/macros.h>

#include <android-base/macros.h>

#include <android-base/scopeguard.h>

#include <android-base/stringprintf.h>

#include <android-base/stringprintf.h>

#include <log/log_event_list.h>

#include <log/log_event_list.h>

#include <log/log_properties.h>

#include <log/log_properties.h>
@@ -38,6 +39,8 @@ 
#include "LogTags.h"

#include "LogTags.h"

#include "LogUtils.h"

#include "LogUtils.h"





using android::base::make_scope_guard;



static LogTags* logtags;

static LogTags* logtags;





const char LogTags::system_event_log_tags[] = "/system/etc/event-log-tags";

const char LogTags::system_event_log_tags[] = "/system/etc/event-log-tags";
@@ -316,27 +319,29 @@ void LogTags::ReadPersistEventLogTags() { 
        std::string Format;

        std::string Format;

        android_log_list_element elem;

        android_log_list_element elem;

        {

        {

            android_log_event_list ctx(log_msg);

            auto ctx = create_android_log_parser(log_msg.msg() + sizeof(uint32_t),

            elem = ctx.read();

                                                 log_msg.entry.len - sizeof(uint32_t));

            auto guard = make_scope_guard([&ctx]() { android_log_destroy(&ctx); });

            elem = android_log_read_next(ctx);

            if (elem.type != EVENT_TYPE_LIST) {

            if (elem.type != EVENT_TYPE_LIST) {

                continue;

                continue;

            }

            }

            elem = ctx.read();

            elem = android_log_read_next(ctx);

            if (elem.type != EVENT_TYPE_INT) {

            if (elem.type != EVENT_TYPE_INT) {

                continue;

                continue;

            }

            }

            Tag = elem.data.int32;

            Tag = elem.data.int32;

            elem = ctx.read();

            elem = android_log_read_next(ctx);

            if (elem.type != EVENT_TYPE_STRING) {

            if (elem.type != EVENT_TYPE_STRING) {

                continue;

                continue;

            }

            }

            Name = std::string(elem.data.string, elem.len);

            Name = std::string(elem.data.string, elem.len);

            elem = ctx.read();

            elem = android_log_read_next(ctx);

            if (elem.type != EVENT_TYPE_STRING) {

            if (elem.type != EVENT_TYPE_STRING) {

                continue;

                continue;

            }

            }

            Format = std::string(elem.data.string, elem.len);

            Format = std::string(elem.data.string, elem.len);

            elem = ctx.read();

            elem = android_log_read_next(ctx);

        }

        }

        if ((elem.type != EVENT_TYPE_LIST_STOP) || !elem.complete) continue;

        if ((elem.type != EVENT_TYPE_LIST_STOP) || !elem.complete) continue;
@@ -524,10 +529,22 @@ void LogTags::WritePmsgEventLogTags(uint32_t tag, uid_t uid) { 
    tag2format_const_iterator iform = tag2format.find(tag);

    tag2format_const_iterator iform = tag2format.find(tag);

    std::string Format = (iform != tag2format.end()) ? iform->second : "";

    std::string Format = (iform != tag2format.end()) ? iform->second : "";





    __android_log_event_list ctx(TAG_DEF_LOG_TAG);

    auto ctx = create_android_logger(TAG_DEF_LOG_TAG);

    ctx << tag << Name << Format;

    auto guard = make_scope_guard([&ctx]() { android_log_destroy(&ctx); });

    std::string buffer(ctx);

    if (android_log_write_int32(ctx, static_cast<int32_t>(tag) < 0) ||

    if (buffer.length() <= 0) return;  // unlikely

        android_log_write_string8_len(ctx, Name.c_str(), Name.size()) < 0 ||

        android_log_write_string8_len(ctx, Format.c_str(), Format.size()) < 0) {

        return;

    }



    const char* cp = nullptr;

    ssize_t len = android_log_write_list_buffer(ctx, &cp);



    if (len <= 0 || cp == nullptr) {

        return;

    }



    std::string buffer(cp, len);





    /*

    /*

     *  struct {

     *  struct {