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

Commit eb560133 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

Merge "Share log writing code."

parents 87eca3cb c7aadc49

liblog/logd_write.c

+7 −37
Original line number Diff line number Diff line
@@ -356,43 +356,7 @@ static int __write_to_log_init(log_id_t log_id, struct iovec *vec, size_t nr) 


int __android_log_write(int prio, const char *tag, const char *msg)

{

    struct iovec vec[3];

    log_id_t log_id = LOG_ID_MAIN;

    char tmp_tag[32];



    if (!tag)

        tag = "";



    /* XXX: This needs to go! */

    if (!strcmp(tag, "HTC_RIL") ||

        !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */

        !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */

        !strcmp(tag, "AT") ||

        !strcmp(tag, "GSM") ||

        !strcmp(tag, "STK") ||

        !strcmp(tag, "CDMA") ||

        !strcmp(tag, "PHONE") ||

        !strcmp(tag, "SMS")) {

            log_id = LOG_ID_RADIO;

            /* Inform third party apps/ril/radio.. to use Rlog or RLOG */

            snprintf(tmp_tag, sizeof(tmp_tag), "use-Rlog/RLOG-%s", tag);

            tag = tmp_tag;

    }



#if __BIONIC__

    if (prio == ANDROID_LOG_FATAL) {

        android_set_abort_message(msg);

    }

#endif



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;

    vec[1].iov_base   = (void *) tag;

    vec[1].iov_len    = strlen(tag) + 1;

    vec[2].iov_base   = (void *) msg;

    vec[2].iov_len    = strlen(msg) + 1;



    return write_to_log(log_id, vec, 3);

    return __android_log_buf_write(LOG_ID_MAIN, prio, tag, msg);

}



int __android_log_buf_write(int bufID, int prio, const char *tag, const char *msg)
@@ -420,6 +384,12 @@ int __android_log_buf_write(int bufID, int prio, const char *tag, const char *ms 
            tag = tmp_tag;

    }



#if __BIONIC__

    if (prio == ANDROID_LOG_FATAL) {

        android_set_abort_message(msg);

    }

#endif



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;

    vec[1].iov_base   = (void *) tag;

liblog/logd_write_kern.c

+5 −35
Original line number Diff line number Diff line
@@ -139,41 +139,7 @@ static int __write_to_log_init(log_id_t log_id, struct iovec *vec, size_t nr) 


int __android_log_write(int prio, const char *tag, const char *msg)

{

    struct iovec vec[3];

    log_id_t log_id = LOG_ID_MAIN;

    char tmp_tag[32];



    if (!tag)

        tag = "";



    /* XXX: This needs to go! */

    if (!strcmp(tag, "HTC_RIL") ||

        !strncmp(tag, "RIL", 3) || /* Any log tag with "RIL" as the prefix */

        !strncmp(tag, "IMS", 3) || /* Any log tag with "IMS" as the prefix */

        !strcmp(tag, "AT") ||

        !strcmp(tag, "GSM") ||

        !strcmp(tag, "STK") ||

        !strcmp(tag, "CDMA") ||

        !strcmp(tag, "PHONE") ||

        !strcmp(tag, "SMS")) {

            log_id = LOG_ID_RADIO;

            /* Inform third party apps/ril/radio.. to use Rlog or RLOG */

            snprintf(tmp_tag, sizeof(tmp_tag), "use-Rlog/RLOG-%s", tag);

            tag = tmp_tag;

    }



    if (prio == ANDROID_LOG_FATAL) {

        android_set_abort_message(msg);

    }



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;

    vec[1].iov_base   = (void *) tag;

    vec[1].iov_len    = strlen(tag) + 1;

    vec[2].iov_base   = (void *) msg;

    vec[2].iov_len    = strlen(msg) + 1;



    return write_to_log(log_id, vec, 3);

    return __android_log_buf_write(LOG_ID_MAIN, prio, tag, msg);

}



int __android_log_buf_write(int bufID, int prio, const char *tag, const char *msg)
@@ -201,6 +167,10 @@ int __android_log_buf_write(int bufID, int prio, const char *tag, const char *ms 
            tag = tmp_tag;

    }



    if (prio == ANDROID_LOG_FATAL) {

        android_set_abort_message(msg);

    }



    vec[0].iov_base   = (unsigned char *) &prio;

    vec[0].iov_len    = 1;

    vec[1].iov_base   = (void *) tag;