summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Salyzyn2017-03-09 10:09:43 -0600
committerMark Salyzyn2017-03-09 11:36:19 -0600
commit2ed51d708eda64516ec79ac6397f690de38f0075 (patch)
tree9ea938a4ee0461c443dc99e197827fc36ecd643b /liblog/logger.h
parentc1b3c8ef2629eac2a73aa4a95bf43a66edf4cd0f (diff)
downloadplatform-system-core-2ed51d708eda64516ec79ac6397f690de38f0075.tar.gz
platform-system-core-2ed51d708eda64516ec79ac6397f690de38f0075.tar.xz
platform-system-core-2ed51d708eda64516ec79ac6397f690de38f0075.zip
liblog: specify clang format
Switch coding style to match SideEffects: None Test: compile Bug: 27405083 Change-Id: Id426d5c5e3b18f2ceec22b31bbc9781aabf6bcca
Diffstat (limited to 'liblog/logger.h')
-rw-r--r--liblog/logger.h135
1 files changed, 66 insertions, 69 deletions
diff --git a/liblog/logger.h b/liblog/logger.h
index d94cd1467..86c75f8b8 100644
--- a/liblog/logger.h
+++ b/liblog/logger.h
@@ -30,25 +30,25 @@ __BEGIN_DECLS
30 30
31/* Union, sock or fd of zero is not allowed unless static initialized */ 31/* Union, sock or fd of zero is not allowed unless static initialized */
32union android_log_context { 32union android_log_context {
33 void *private; 33 void* private;
34 atomic_int sock; 34 atomic_int sock;
35 atomic_int fd; 35 atomic_int fd;
36 struct listnode *node; 36 struct listnode* node;
37 atomic_uintptr_t atomic_pointer; 37 atomic_uintptr_t atomic_pointer;
38}; 38};
39 39
40struct android_log_transport_write { 40struct android_log_transport_write {
41 struct listnode node; 41 struct listnode node;
42 const char *name; /* human name to describe the transport */ 42 const char* name; /* human name to describe the transport */
43 unsigned logMask; /* mask cache of available() success */ 43 unsigned logMask; /* mask cache of available() success */
44 union android_log_context context; /* Initialized by static allocation */ 44 union android_log_context context; /* Initialized by static allocation */
45 45
46 int (*available)(log_id_t logId); /* Does not cause resources to be taken */ 46 int (*available)(log_id_t logId); /* Does not cause resources to be taken */
47 int (*open)(); /* can be called multiple times, reusing current resources */ 47 int (*open)(); /* can be called multiple times, reusing current resources */
48 void (*close)(); /* free up resources */ 48 void (*close)(); /* free up resources */
49 /* write log to transport, returns number of bytes propagated, or -errno */ 49 /* write log to transport, returns number of bytes propagated, or -errno */
50 int (*write)(log_id_t logId, struct timespec *ts, 50 int (*write)(log_id_t logId, struct timespec* ts, struct iovec* vec,
51 struct iovec *vec, size_t nr); 51 size_t nr);
52}; 52};
53 53
54struct android_log_logger_list; 54struct android_log_logger_list;
@@ -57,45 +57,44 @@ struct android_log_logger;
57 57
58struct android_log_transport_read { 58struct android_log_transport_read {
59 struct listnode node; 59 struct listnode node;
60 const char *name; /* human name to describe the transport */ 60 const char* name; /* human name to describe the transport */
61 61
62 /* Does not cause resources to be taken */ 62 /* Does not cause resources to be taken */
63 int (*available)(log_id_t logId); 63 int (*available)(log_id_t logId);
64 int (*version)(struct android_log_logger *logger, 64 int (*version)(struct android_log_logger* logger,
65 struct android_log_transport_context *transp); 65 struct android_log_transport_context* transp);
66 /* Release resources taken by the following interfaces */ 66 /* Release resources taken by the following interfaces */
67 void (*close)(struct android_log_logger_list *logger_list, 67 void (*close)(struct android_log_logger_list* logger_list,
68 struct android_log_transport_context *transp); 68 struct android_log_transport_context* transp);
69 /* 69 /*
70 * Expect all to instantiate open automagically on any call, 70 * Expect all to instantiate open automagically on any call,
71 * so we do not have an explicit open call. 71 * so we do not have an explicit open call.
72 */ 72 */
73 int (*read)(struct android_log_logger_list *logger_list, 73 int (*read)(struct android_log_logger_list* logger_list,
74 struct android_log_transport_context *transp, 74 struct android_log_transport_context* transp,
75 struct log_msg *log_msg); 75 struct log_msg* log_msg);
76 /* Must only be called if not ANDROID_LOG_NONBLOCK (blocking) */ 76 /* Must only be called if not ANDROID_LOG_NONBLOCK (blocking) */
77 int (*poll)(struct android_log_logger_list *logger_list, 77 int (*poll)(struct android_log_logger_list* logger_list,
78 struct android_log_transport_context *transp); 78 struct android_log_transport_context* transp);
79 79
80 int (*clear)(struct android_log_logger *logger, 80 int (*clear)(struct android_log_logger* logger,
81 struct android_log_transport_context *transp); 81 struct android_log_transport_context* transp);
82 ssize_t (*setSize)(struct android_log_logger *logger, 82 ssize_t (*setSize)(struct android_log_logger* logger,
83 struct android_log_transport_context *transp, 83 struct android_log_transport_context* transp, size_t size);
84 size_t size); 84 ssize_t (*getSize)(struct android_log_logger* logger,
85 ssize_t (*getSize)(struct android_log_logger *logger, 85 struct android_log_transport_context* transp);
86 struct android_log_transport_context *transp); 86 ssize_t (*getReadableSize)(struct android_log_logger* logger,
87 ssize_t (*getReadableSize)(struct android_log_logger *logger, 87 struct android_log_transport_context* transp);
88 struct android_log_transport_context *transp); 88
89 89 ssize_t (*getPrune)(struct android_log_logger_list* logger_list,
90 ssize_t (*getPrune)(struct android_log_logger_list *logger_list, 90 struct android_log_transport_context* transp, char* buf,
91 struct android_log_transport_context *transp, 91 size_t len);
92 char *buf, size_t len); 92 ssize_t (*setPrune)(struct android_log_logger_list* logger_list,
93 ssize_t (*setPrune)(struct android_log_logger_list *logger_list, 93 struct android_log_transport_context* transp, char* buf,
94 struct android_log_transport_context *transp, 94 size_t len);
95 char *buf, size_t len); 95 ssize_t (*getStats)(struct android_log_logger_list* logger_list,
96 ssize_t (*getStats)(struct android_log_logger_list *logger_list, 96 struct android_log_transport_context* transp, char* buf,
97 struct android_log_transport_context *transp, 97 size_t len);
98 char *buf, size_t len);
99}; 98};
100 99
101struct android_log_logger_list { 100struct android_log_logger_list {
@@ -110,7 +109,7 @@ struct android_log_logger_list {
110 109
111struct android_log_logger { 110struct android_log_logger {
112 struct listnode node; 111 struct listnode node;
113 struct android_log_logger_list *parent; 112 struct android_log_logger_list* parent;
114 113
115 log_id_t logId; 114 log_id_t logId;
116}; 115};
@@ -118,34 +117,32 @@ struct android_log_logger {
118struct android_log_transport_context { 117struct android_log_transport_context {
119 struct listnode node; 118 struct listnode node;
120 union android_log_context context; /* zero init per-transport context */ 119 union android_log_context context; /* zero init per-transport context */
121 struct android_log_logger_list *parent; 120 struct android_log_logger_list* parent;
122 121
123 struct android_log_transport_read *transport; 122 struct android_log_transport_read* transport;
124 unsigned logMask; /* mask of requested log buffers */ 123 unsigned logMask; /* mask of requested log buffers */
125 int ret; /* return value associated with following data */ 124 int ret; /* return value associated with following data */
126 struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */ 125 struct log_msg logMsg; /* peek at upcoming data, valid if logMsg.len != 0 */
127}; 126};
128 127
129/* assumes caller has structures read-locked, single threaded, or fenced */ 128/* assumes caller has structures read-locked, single threaded, or fenced */
130#define transport_context_for_each(transp, logger_list) \ 129#define transport_context_for_each(transp, logger_list) \
131 for ((transp) = node_to_item((logger_list)->transport.next, \ 130 for ((transp) = node_to_item((logger_list)->transport.next, \
132 struct android_log_transport_context, \ 131 struct android_log_transport_context, node); \
133 node); \ 132 ((transp) != node_to_item(&(logger_list)->transport, \
134 ((transp) != node_to_item(&(logger_list)->transport, \ 133 struct android_log_transport_context, node)) && \
135 struct android_log_transport_context, \ 134 ((transp)->parent == (logger_list)); \
136 node)) && \ 135 (transp) = node_to_item((transp)->node.next, \
137 ((transp)->parent == (logger_list)); \ 136 struct android_log_transport_context, node))
138 (transp) = node_to_item((transp)->node.next, \
139 struct android_log_transport_context, node))
140 137
141#define logger_for_each(logp, logger_list) \ 138#define logger_for_each(logp, logger_list) \
142 for ((logp) = node_to_item((logger_list)->logger.next, \ 139 for ((logp) = node_to_item((logger_list)->logger.next, \
143 struct android_log_logger, node); \ 140 struct android_log_logger, node); \
144 ((logp) != node_to_item(&(logger_list)->logger, \ 141 ((logp) != node_to_item(&(logger_list)->logger, \
145 struct android_log_logger, node)) && \ 142 struct android_log_logger, node)) && \
146 ((logp)->parent == (logger_list)); \ 143 ((logp)->parent == (logger_list)); \
147 (logp) = node_to_item((logp)->node.next, \ 144 (logp) = \
148 struct android_log_logger, node)) 145 node_to_item((logp)->node.next, struct android_log_logger, node))
149 146
150/* 147/*
151 * Global list of log readers. 148 * Global list of log readers.
@@ -168,28 +165,28 @@ LIBLOG_HIDDEN pthread_rwlock_t __android_log_readers_lock;
168#endif 165#endif
169 166
170/* Must be called with logger_list_rdlock() or logger_list_wrlock() held */ 167/* Must be called with logger_list_rdlock() or logger_list_wrlock() held */
171#define logger_list_for_each(logger_list) \ 168#define logger_list_for_each(logger_list) \
172 for ((logger_list) = node_to_item(&__android_log_readers, \ 169 for ((logger_list) = node_to_item(&__android_log_readers, \
173 struct android_log_logger_list, \ 170 struct android_log_logger_list, node); \
174 node); \ 171 (logger_list) != node_to_item(&__android_log_readers, \
175 (logger_list) != node_to_item(&__android_log_readers, \ 172 struct android_log_logger_list, node) && \
176 struct android_log_logger_list, \ 173 (logger_list) != node_to_item((logger_list)->node.next, \
177 node) && \ 174 struct android_log_logger_list, node); \
178 (logger_list) != node_to_item((logger_list)->node.next, \ 175 (logger_list) = node_to_item((logger_list)->node.next, \
179 struct android_log_logger_list, \ 176 struct android_log_logger_list, node))
180 node); \
181 (logger_list) = node_to_item((logger_list)->node.next, \
182 struct android_log_logger_list, \
183 node))
184 177
185/* OS specific dribs and drabs */ 178/* OS specific dribs and drabs */
186 179
187#if defined(_WIN32) 180#if defined(_WIN32)
188#include <private/android_filesystem_config.h> 181#include <private/android_filesystem_config.h>
189typedef uint32_t uid_t; 182typedef uint32_t uid_t;
190static inline uid_t __android_log_uid() { return AID_SYSTEM; } 183static inline uid_t __android_log_uid() {
184 return AID_SYSTEM;
185}
191#else 186#else
192static inline uid_t __android_log_uid() { return getuid(); } 187static inline uid_t __android_log_uid() {
188 return getuid();
189}
193#endif 190#endif
194 191
195LIBLOG_HIDDEN void __android_log_lock(); 192LIBLOG_HIDDEN void __android_log_lock();