Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
halo
system_core
Commits
ccbadc6b
Commit
ccbadc6b
authored
10 years ago
by
Mark Salyzyn
Browse files
Options
Download
Email Patches
Plain Diff
logd: report reinit
Bug: 19681572 Change-Id: I343b9d108f064f87df79512a0fdf1b35513c3136
parent
48d06069
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
+23
-9
logd/LogAudit.cpp
logd/LogAudit.cpp
+4
-4
logd/main.cpp
logd/main.cpp
+19
-5
No files found.
logd/LogAudit.cpp
View file @
ccbadc6b
...
...
@@ -29,10 +29,10 @@
#include "libaudit.h"
#include "LogAudit.h"
#define KMSG_PRIORITY(PRI) \
'<', \
'0' +
(LOG_AUTH |
(PRI)) / 10, \
'0' +
(LOG_AUTH |
(PRI)) % 10, \
#define KMSG_PRIORITY(PRI)
\
'<',
\
'0' +
LOG_MAKEPRI(LOG_AUTH, LOG_PRI
(PRI)) / 10, \
'0' +
LOG_MAKEPRI(LOG_AUTH, LOG_PRI
(PRI)) % 10, \
'>'
LogAudit
::
LogAudit
(
LogBuffer
*
buf
,
LogReader
*
reader
,
int
fdDmesg
)
...
...
This diff is collapsed.
Click to expand it.
logd/main.cpp
View file @
ccbadc6b
...
...
@@ -29,6 +29,7 @@
#include <sys/prctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <syslog.h>
#include <unistd.h>
#include <cutils/properties.h>
...
...
@@ -41,6 +42,12 @@
#include "LogListener.h"
#include "LogAudit.h"
#define KMSG_PRIORITY(PRI) \
'<', \
'0' + LOG_MAKEPRI(LOG_DAEMON, LOG_PRI(PRI)) / 10, \
'0' + LOG_MAKEPRI(LOG_DAEMON, LOG_PRI(PRI)) % 10, \
'>'
//
// The service is designed to be run by init, it does not respond well
// to starting up manually. When starting up manually the sockets will
...
...
@@ -131,6 +138,11 @@ static bool property_get_bool(const char *key, bool def) {
return
def
;
}
// Remove the static, and use this variable
// globally for debugging if necessary. eg:
// write(fdDmesg, "I am here\n", 10);
static
int
fdDmesg
=
-
1
;
static
sem_t
reinit
;
static
bool
reinit_running
=
false
;
static
LogBuffer
*
logBuf
=
NULL
;
...
...
@@ -143,6 +155,13 @@ static void *reinit_thread_start(void * /*obj*/) {
setuid
(
AID_LOGD
);
while
(
reinit_running
&&
!
sem_wait
(
&
reinit
)
&&
reinit_running
)
{
if
(
fdDmesg
>=
0
)
{
static
const
char
reinit_message
[]
=
{
KMSG_PRIORITY
(
LOG_INFO
),
'l'
,
'o'
,
'g'
,
'd'
,
'.'
,
'd'
,
'a'
,
'e'
,
'm'
,
'o'
,
'n'
,
':'
,
' '
,
'r'
,
'e'
,
'i'
,
'n'
,
'i'
,
't'
,
'\n'
};
write
(
fdDmesg
,
reinit_message
,
sizeof
(
reinit_message
));
}
// Anything that reads persist.<property>
if
(
logBuf
)
{
logBuf
->
init
();
...
...
@@ -158,11 +177,6 @@ void reinit_signal_handler(int /*signal*/) {
sem_post
(
&
reinit
);
}
// Remove the static, and use this variable
// globally for debugging if necessary. eg:
// write(fdDmesg, "I am here\n", 10);
static
int
fdDmesg
=
-
1
;
// Foreground waits for exit of the main persistent threads
// that are started here. The threads are created to manage
// UNIX domain client sockets for writing, reading and
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment