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

Commit 719fd238 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Added default constructor for log_t."

parents 5328f671 c75a02fe
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -59,6 +59,8 @@ bool is_allowed_in_logcat(enum logtype ltype) {
void _LOG(log_t* log, enum logtype ltype, const char* fmt, ...) {
void _LOG(log_t* log, enum logtype ltype, const char* fmt, ...) {
  bool write_to_tombstone = (log->tfd != -1);
  bool write_to_tombstone = (log->tfd != -1);
  bool write_to_logcat = is_allowed_in_logcat(ltype)
  bool write_to_logcat = is_allowed_in_logcat(ltype)
                      && log->crashed_tid != -1
                      && log->current_tid != -1
                      && (log->crashed_tid == log->current_tid);
                      && (log->crashed_tid == log->current_tid);
  bool write_to_activitymanager = (log->amfd != -1);
  bool write_to_activitymanager = (log->amfd != -1);


+5 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@
#endif
#endif




typedef struct {
struct log_t{
    /* tombstone file descriptor */
    /* tombstone file descriptor */
    int tfd;
    int tfd;
    /* Activity Manager socket file descriptor */
    /* Activity Manager socket file descriptor */
@@ -46,7 +46,10 @@ typedef struct {
    pid_t crashed_tid;
    pid_t crashed_tid;
    // The tid of the thread we are currently working with.
    // The tid of the thread we are currently working with.
    pid_t current_tid;
    pid_t current_tid;
} log_t;

    log_t()
        : tfd(-1), amfd(-1), crashed_tid(-1), current_tid(-1) {}
};


// List of types of logs to simplify the logging decision in _LOG
// List of types of logs to simplify the logging decision in _LOG
enum logtype {
enum logtype {