Skip to content

Commit ce7ee08

Browse files
Treehugger RobotGerrit Code Review
Treehugger Robot
authored and
Gerrit Code Review
committed
Merge changes I7c1c0f3d,I670cb0b7,Id426d5c5
* changes: liblog: replace "frontend" with "transport" liblog: stay away from C++ keyword private liblog: specify clang format
2 parents ac13718 + 81321a7 commit ce7ee08

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+10382
-10669
lines changed

‎liblog/.clang-format

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
BasedOnStyle: Google
2+
AllowShortFunctionsOnASingleLine: false
3+
4+
CommentPragmas: NOLINT:.*
5+
DerivePointerAlignment: false
6+
PointerAlignment: Left
7+
PenaltyExcessCharacter: 32
8+
9+
Cpp11BracedListStyle: false

‎liblog/README

+9-9
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,10 @@ SYNOPSIS
108108

109109
int android_log_destroy(android_log_context *ctx)
110110

111-
#include <log/log_frontend.h>
111+
#include <log/log_transport.h>
112112

113-
int android_set_log_frontend(int frontend_flag)
114-
int android_get_log_frontend()
113+
int android_set_log_transport(int transport_flag)
114+
int android_get_log_transport()
115115

116116
Link with -llog
117117

@@ -167,12 +167,12 @@ DESCRIPTION
167167
when opening the sub-log. It is recommended to open the log
168168
ANDROID_LOG_RDONLY in these cases.
169169

170-
android_set_log_frontend() selects frontend filters. Argument is either
171-
LOGGER_DEFAULT, LOGGER_LOGD, LOGGER_NULL or LOGGER_LOCAL. Log to logger
172-
daemon for default or logd, drop contents on floor, or log into local
173-
memory respectively. Both android_set_log_frontend() and
174-
android_get_log_frontend() return the current frontend mask, or a
175-
negative errno for any problems.
170+
android_set_log_transport() selects transport filters. Argument is
171+
either LOGGER_DEFAULT, LOGGER_LOGD, LOGGER_NULL or LOGGER_LOCAL. Log to
172+
logger daemon for default or logd, drop contents on floor, or log into
173+
local memory respectively. Both android_set_log_transport()
174+
and android_get_log_transport() return the current transport mask, or
175+
a negative errno for any problems.
176176

177177
ERRORS
178178
If messages fail, a negative error code will be returned to the caller.

‎liblog/config_read.c

+47-49
Original file line numberDiff line numberDiff line change
@@ -14,75 +14,73 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <log/log_frontend.h>
17+
#include <log/log_transport.h>
1818

1919
#include "config_read.h"
2020
#include "logger.h"
2121

22-
LIBLOG_HIDDEN struct listnode __android_log_transport_read =
23-
{ &__android_log_transport_read, &__android_log_transport_read };
24-
LIBLOG_HIDDEN struct listnode __android_log_persist_read =
25-
{ &__android_log_persist_read, &__android_log_persist_read };
22+
LIBLOG_HIDDEN struct listnode __android_log_transport_read = {
23+
&__android_log_transport_read, &__android_log_transport_read
24+
};
25+
LIBLOG_HIDDEN struct listnode __android_log_persist_read = {
26+
&__android_log_persist_read, &__android_log_persist_read
27+
};
2628

2729
static void __android_log_add_transport(
28-
struct listnode *list, struct android_log_transport_read *transport) {
29-
size_t i;
30+
struct listnode* list, struct android_log_transport_read* transport) {
31+
size_t i;
3032

31-
/* Try to keep one functioning transport for each log buffer id */
32-
for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {
33-
struct android_log_transport_read *transp;
33+
/* Try to keep one functioning transport for each log buffer id */
34+
for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {
35+
struct android_log_transport_read* transp;
3436

35-
if (list_empty(list)) {
36-
if (!transport->available || ((*transport->available)(i) >= 0)) {
37-
list_add_tail(list, &transport->node);
38-
return;
39-
}
40-
} else {
41-
read_transport_for_each(transp, list) {
42-
if (!transp->available) {
43-
return;
44-
}
45-
if (((*transp->available)(i) < 0) &&
46-
(!transport->available ||
47-
((*transport->available)(i) >= 0))) {
48-
list_add_tail(list, &transport->node);
49-
return;
50-
}
51-
}
37+
if (list_empty(list)) {
38+
if (!transport->available || ((*transport->available)(i) >= 0)) {
39+
list_add_tail(list, &transport->node);
40+
return;
41+
}
42+
} else {
43+
read_transport_for_each(transp, list) {
44+
if (!transp->available) {
45+
return;
5246
}
47+
if (((*transp->available)(i) < 0) &&
48+
(!transport->available || ((*transport->available)(i) >= 0))) {
49+
list_add_tail(list, &transport->node);
50+
return;
51+
}
52+
}
5353
}
54+
}
5455
}
5556

5657
LIBLOG_HIDDEN void __android_log_config_read() {
57-
if (__android_log_frontend & LOGGER_LOCAL) {
58-
extern struct android_log_transport_read localLoggerRead;
58+
if (__android_log_transport & LOGGER_LOCAL) {
59+
extern struct android_log_transport_read localLoggerRead;
5960

60-
__android_log_add_transport(&__android_log_transport_read,
61-
&localLoggerRead);
62-
}
61+
__android_log_add_transport(&__android_log_transport_read, &localLoggerRead);
62+
}
6363

6464
#if (FAKE_LOG_DEVICE == 0)
65-
if ((__android_log_frontend == LOGGER_DEFAULT) ||
66-
(__android_log_frontend & LOGGER_LOGD)) {
67-
extern struct android_log_transport_read logdLoggerRead;
68-
extern struct android_log_transport_read pmsgLoggerRead;
65+
if ((__android_log_transport == LOGGER_DEFAULT) ||
66+
(__android_log_transport & LOGGER_LOGD)) {
67+
extern struct android_log_transport_read logdLoggerRead;
68+
extern struct android_log_transport_read pmsgLoggerRead;
6969

70-
__android_log_add_transport(&__android_log_transport_read,
71-
&logdLoggerRead);
72-
__android_log_add_transport(&__android_log_persist_read,
73-
&pmsgLoggerRead);
74-
}
70+
__android_log_add_transport(&__android_log_transport_read, &logdLoggerRead);
71+
__android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead);
72+
}
7573
#endif
7674
}
7775

7876
LIBLOG_HIDDEN void __android_log_config_read_close() {
79-
struct android_log_transport_read *transport;
80-
struct listnode *n;
77+
struct android_log_transport_read* transport;
78+
struct listnode* n;
8179

82-
read_transport_for_each_safe(transport, n, &__android_log_transport_read) {
83-
list_remove(&transport->node);
84-
}
85-
read_transport_for_each_safe(transport, n, &__android_log_persist_read) {
86-
list_remove(&transport->node);
87-
}
80+
read_transport_for_each_safe(transport, n, &__android_log_transport_read) {
81+
list_remove(&transport->node);
82+
}
83+
read_transport_for_each_safe(transport, n, &__android_log_persist_read) {
84+
list_remove(&transport->node);
85+
}
8886
}

‎liblog/config_read.h

+20-24
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,26 @@ __BEGIN_DECLS
2626
extern LIBLOG_HIDDEN struct listnode __android_log_transport_read;
2727
extern LIBLOG_HIDDEN struct listnode __android_log_persist_read;
2828

29-
#define read_transport_for_each(transp, transports) \
30-
for ((transp) = node_to_item((transports)->next, \
31-
struct android_log_transport_read, node); \
32-
((transp) != node_to_item((transports), \
33-
struct android_log_transport_read, \
34-
node)) && \
35-
((transp) != node_to_item((transp)->node.next, \
36-
struct android_log_transport_read, \
37-
node)); \
38-
(transp) = node_to_item((transp)->node.next, \
39-
struct android_log_transport_read, node))
40-
41-
#define read_transport_for_each_safe(transp, n, transports) \
42-
for ((transp) = node_to_item((transports)->next, \
43-
struct android_log_transport_read, node), \
44-
(n) = (transp)->node.next; \
45-
((transp) != node_to_item((transports), \
46-
struct android_log_transport_read, \
47-
node)) && \
48-
((transp) != node_to_item((n), struct android_log_transport_read, \
49-
node)); \
50-
(transp) = node_to_item((n), struct android_log_transport_read, \
51-
node), \
52-
(n) = (transp)->node.next)
29+
#define read_transport_for_each(transp, transports) \
30+
for ((transp) = node_to_item((transports)->next, \
31+
struct android_log_transport_read, node); \
32+
((transp) != node_to_item((transports), \
33+
struct android_log_transport_read, node)) && \
34+
((transp) != node_to_item((transp)->node.next, \
35+
struct android_log_transport_read, node)); \
36+
(transp) = node_to_item((transp)->node.next, \
37+
struct android_log_transport_read, node))
38+
39+
#define read_transport_for_each_safe(transp, n, transports) \
40+
for ((transp) = node_to_item((transports)->next, \
41+
struct android_log_transport_read, node), \
42+
(n) = (transp)->node.next; \
43+
((transp) != node_to_item((transports), \
44+
struct android_log_transport_read, node)) && \
45+
((transp) != \
46+
node_to_item((n), struct android_log_transport_read, node)); \
47+
(transp) = node_to_item((n), struct android_log_transport_read, node), \
48+
(n) = (transp)->node.next)
5349

5450
LIBLOG_HIDDEN void __android_log_config_read();
5551
LIBLOG_HIDDEN void __android_log_config_read_close();

‎liblog/config_write.c

+73-73
Original file line numberDiff line numberDiff line change
@@ -14,105 +14,105 @@
1414
* limitations under the License.
1515
*/
1616

17-
#include <log/log_frontend.h>
17+
#include <log/log_transport.h>
1818

1919
#include "config_write.h"
2020
#include "logger.h"
2121

22-
LIBLOG_HIDDEN struct listnode __android_log_transport_write =
23-
{ &__android_log_transport_write, &__android_log_transport_write };
24-
LIBLOG_HIDDEN struct listnode __android_log_persist_write =
25-
{ &__android_log_persist_write, &__android_log_persist_write};
22+
LIBLOG_HIDDEN struct listnode __android_log_transport_write = {
23+
&__android_log_transport_write, &__android_log_transport_write
24+
};
25+
LIBLOG_HIDDEN struct listnode __android_log_persist_write = {
26+
&__android_log_persist_write, &__android_log_persist_write
27+
};
2628

2729
static void __android_log_add_transport(
28-
struct listnode *list, struct android_log_transport_write *transport) {
29-
size_t i;
30+
struct listnode* list, struct android_log_transport_write* transport) {
31+
size_t i;
3032

31-
/* Try to keep one functioning transport for each log buffer id */
32-
for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {
33-
struct android_log_transport_write *transp;
33+
/* Try to keep one functioning transport for each log buffer id */
34+
for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {
35+
struct android_log_transport_write* transp;
3436

35-
if (list_empty(list)) {
36-
if (!transport->available || ((*transport->available)(i) >= 0)) {
37-
list_add_tail(list, &transport->node);
38-
return;
39-
}
40-
} else {
41-
write_transport_for_each(transp, list) {
42-
if (!transp->available) {
43-
return;
44-
}
45-
if (((*transp->available)(i) < 0) &&
46-
(!transport->available ||
47-
((*transport->available)(i) >= 0))) {
48-
list_add_tail(list, &transport->node);
49-
return;
50-
}
51-
}
37+
if (list_empty(list)) {
38+
if (!transport->available || ((*transport->available)(i) >= 0)) {
39+
list_add_tail(list, &transport->node);
40+
return;
41+
}
42+
} else {
43+
write_transport_for_each(transp, list) {
44+
if (!transp->available) {
45+
return;
5246
}
47+
if (((*transp->available)(i) < 0) &&
48+
(!transport->available || ((*transport->available)(i) >= 0))) {
49+
list_add_tail(list, &transport->node);
50+
return;
51+
}
52+
}
5353
}
54+
}
5455
}
5556

5657
LIBLOG_HIDDEN void __android_log_config_write() {
57-
if (__android_log_frontend & LOGGER_LOCAL) {
58-
extern struct android_log_transport_write localLoggerWrite;
58+
if (__android_log_transport & LOGGER_LOCAL) {
59+
extern struct android_log_transport_write localLoggerWrite;
5960

60-
__android_log_add_transport(&__android_log_transport_write,
61-
&localLoggerWrite);
62-
}
61+
__android_log_add_transport(&__android_log_transport_write,
62+
&localLoggerWrite);
63+
}
6364

64-
if ((__android_log_frontend == LOGGER_DEFAULT) ||
65-
(__android_log_frontend & LOGGER_LOGD)) {
65+
if ((__android_log_transport == LOGGER_DEFAULT) ||
66+
(__android_log_transport & LOGGER_LOGD)) {
6667
#if (FAKE_LOG_DEVICE == 0)
67-
extern struct android_log_transport_write logdLoggerWrite;
68-
extern struct android_log_transport_write pmsgLoggerWrite;
68+
extern struct android_log_transport_write logdLoggerWrite;
69+
extern struct android_log_transport_write pmsgLoggerWrite;
6970

70-
__android_log_add_transport(&__android_log_transport_write,
71-
&logdLoggerWrite);
72-
__android_log_add_transport(&__android_log_persist_write,
73-
&pmsgLoggerWrite);
71+
__android_log_add_transport(&__android_log_transport_write,
72+
&logdLoggerWrite);
73+
__android_log_add_transport(&__android_log_persist_write, &pmsgLoggerWrite);
7474
#else
75-
extern struct android_log_transport_write fakeLoggerWrite;
75+
extern struct android_log_transport_write fakeLoggerWrite;
7676

77-
__android_log_add_transport(&__android_log_transport_write,
78-
&fakeLoggerWrite);
77+
__android_log_add_transport(&__android_log_transport_write,
78+
&fakeLoggerWrite);
7979
#endif
80-
}
80+
}
8181

82-
if (__android_log_frontend & LOGGER_STDERR) {
83-
extern struct android_log_transport_write stderrLoggerWrite;
82+
if (__android_log_transport & LOGGER_STDERR) {
83+
extern struct android_log_transport_write stderrLoggerWrite;
8484

85-
/*
86-
* stderr logger should be primary if we can be the only one, or if
87-
* already in the primary list. Otherwise land in the persist list.
88-
* Remember we can be called here if we are already initialized.
89-
*/
90-
if (list_empty(&__android_log_transport_write)) {
91-
__android_log_add_transport(&__android_log_transport_write,
92-
&stderrLoggerWrite);
93-
} else {
94-
struct android_log_transport_write *transp;
95-
write_transport_for_each(transp, &__android_log_transport_write) {
96-
if (transp == &stderrLoggerWrite) {
97-
return;
98-
}
99-
}
100-
__android_log_add_transport(&__android_log_persist_write,
101-
&stderrLoggerWrite);
85+
/*
86+
* stderr logger should be primary if we can be the only one, or if
87+
* already in the primary list. Otherwise land in the persist list.
88+
* Remember we can be called here if we are already initialized.
89+
*/
90+
if (list_empty(&__android_log_transport_write)) {
91+
__android_log_add_transport(&__android_log_transport_write,
92+
&stderrLoggerWrite);
93+
} else {
94+
struct android_log_transport_write* transp;
95+
write_transport_for_each(transp, &__android_log_transport_write) {
96+
if (transp == &stderrLoggerWrite) {
97+
return;
10298
}
99+
}
100+
__android_log_add_transport(&__android_log_persist_write,
101+
&stderrLoggerWrite);
103102
}
103+
}
104104
}
105105

106106
LIBLOG_HIDDEN void __android_log_config_write_close() {
107-
struct android_log_transport_write *transport;
108-
struct listnode *n;
107+
struct android_log_transport_write* transport;
108+
struct listnode* n;
109109

110-
write_transport_for_each_safe(transport, n, &__android_log_transport_write) {
111-
transport->logMask = 0;
112-
list_remove(&transport->node);
113-
}
114-
write_transport_for_each_safe(transport, n, &__android_log_persist_write) {
115-
transport->logMask = 0;
116-
list_remove(&transport->node);
117-
}
110+
write_transport_for_each_safe(transport, n, &__android_log_transport_write) {
111+
transport->logMask = 0;
112+
list_remove(&transport->node);
113+
}
114+
write_transport_for_each_safe(transport, n, &__android_log_persist_write) {
115+
transport->logMask = 0;
116+
list_remove(&transport->node);
117+
}
118118
}

0 commit comments

Comments
 (0)