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

Commit 3cdbdd52 authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

liblog: add log/log_id.h 

Move common log_id_t and simple internal support function definitions
that use it from log/log.h to log/log_id.h.

log_id_t
__android_log_buf_write
__android_log_buf_print
android_name_to_log_id
android_log_id_to_name

Test: gTest liblog-unit-tests --gtest_filter=\
      liblog.log_id:\
      liblog.__android_log_buf_print:\
      liblog.__android_log_buf_write:\
      liblog.__android_log_buf_print__concurrent64
Bug: 34250038
Change-Id: Iad3704cc72943a3094e1193a6d032c7f29a6cd5c
parent 5c967da3

liblog/include/log/log.h

+1 −35
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <unistd.h>



#include <android/log.h>

#include <log/log_id.h>

#include <log/log_main.h>

#include <log/uio.h> /* helper to define iovec for portability */
@@ -74,16 +75,6 @@ extern "C" { 
#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"

#endif



/*

 * Send a simple string to the log.

 */

int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);

int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 4, 5)))

#endif

    ;



/*

 * Simplified macro to send a verbose system log message using current LOG_TAG.

 */
@@ -321,25 +312,6 @@ typedef enum { 
        (void) __android_log_bswrite(_tag, _value);

#endif



#ifndef log_id_t_defined

#define log_id_t_defined

typedef enum log_id {

    LOG_ID_MIN = 0,



    LOG_ID_MAIN = 0,

    LOG_ID_RADIO = 1,

    LOG_ID_EVENTS = 2,

    LOG_ID_SYSTEM = 3,

    LOG_ID_CRASH = 4,

    LOG_ID_SECURITY = 5,

    LOG_ID_KERNEL = 6, /* place last, third-parties can not use it */



    LOG_ID_MAX

} log_id_t;

#endif

#define sizeof_log_id_t sizeof(typeof_log_id_t)

#define typeof_log_id_t unsigned char



/* --------------------------------------------------------------------- */



/*
@@ -776,12 +748,6 @@ clockid_t android_log_clockid(); 


#endif /* __linux__ */



/*

 * log_id_t helpers

 */

log_id_t android_name_to_log_id(const char* logName);

const char* android_log_id_to_name(log_id_t log_id);



/* --------------------------------------------------------------------- */



#ifndef _ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE

liblog/include/log/log_id.h

0 → 100644
+63 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2005-2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef _LIBS_LOG_LOG_ID_H

#define _LIBS_LOG_LOG_ID_H



#ifdef __cplusplus

extern "C" {

#endif



#ifndef log_id_t_defined

#define log_id_t_defined

typedef enum log_id {

    LOG_ID_MIN = 0,



    LOG_ID_MAIN = 0,

    LOG_ID_RADIO = 1,

    LOG_ID_EVENTS = 2,

    LOG_ID_SYSTEM = 3,

    LOG_ID_CRASH = 4,

    LOG_ID_SECURITY = 5,

    LOG_ID_KERNEL = 6, /* place last, third-parties can not use it */



    LOG_ID_MAX

} log_id_t;

#endif

#define sizeof_log_id_t sizeof(typeof_log_id_t)

#define typeof_log_id_t unsigned char



/*

 * Send a simple string to the log.

 */

int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);

int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)

#if defined(__GNUC__)

    __attribute__((__format__(printf, 4, 5)))

#endif

    ;



/*

 * log_id_t helpers

 */

log_id_t android_name_to_log_id(const char* logName);

const char* android_log_id_to_name(log_id_t log_id);



#ifdef __cplusplus

}

#endif



#endif /* _LIBS_LOG_LOG_ID_H */

liblog/include_vndk/log/log.h

+1 −1
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ 
#define _LIBS_LOG_LOG_H



#include <android/log.h>

#include <log/log_id.h>

#include <log/log_main.h>



/*The following files will be included once they are available*/

/*#include <log/log_id.h>*/

/*#include <log/log_radio.h>*/



/*

liblog/include_vndk/log/log_id.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../include/log/log_id.h
 
 No newline at end of file

liblog/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ test_c_flags := \ 
    -fno-builtin \



test_src_files := \

    liblog_test.cpp

    liblog_test.cpp \

    log_id_test.cpp



# to prevent breaking the build if bionic not relatively visible to us

ifneq ($(wildcard $(LOCAL_PATH)/../../../../bionic/libc/bionic/libc_logging.cpp),)