Clean up a few mistakes in logging initialization 1) Only init needs to clear stdout/stderr/stdin, so remove this from ueventd, watchdogd, and subcontext init 2) Only init should reboot due to FATAL errors. This was true even before this change due to getpid() checks, but there's no reason to not just use the DefaultAborter for other processes. 3) It's probably a mistake for FATAL logs in init to try to gracefully shutdown the system, so simply call RebootSystem() here. 4) Lastly, remove log.cpp since it's not actually shared code anymore Test: build Change-Id: Ic8c323393dc7ee98ed6bb9691361b51d0d915267
79 lines
2.2 KiB
C++
79 lines
2.2 KiB
C++
/*
|
|
* Copyright (C) 2012 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.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <linux/watchdog.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#include <android-base/logging.h>
|
|
|
|
#ifdef _INIT_INIT_H
|
|
#error "Do not include init.h in files used by ueventd or watchdogd; it will expose init's globals"
|
|
#endif
|
|
|
|
#define DEV_NAME "/dev/watchdog"
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
int watchdogd_main(int argc, char **argv) {
|
|
android::base::InitLogging(argv, &android::base::KernelLogger);
|
|
|
|
int interval = 10;
|
|
if (argc >= 2) interval = atoi(argv[1]);
|
|
|
|
int margin = 10;
|
|
if (argc >= 3) margin = atoi(argv[2]);
|
|
|
|
LOG(INFO) << "watchdogd started (interval " << interval << ", margin " << margin << ")!";
|
|
|
|
int fd = open(DEV_NAME, O_RDWR|O_CLOEXEC);
|
|
if (fd == -1) {
|
|
PLOG(ERROR) << "Failed to open " << DEV_NAME;
|
|
return 1;
|
|
}
|
|
|
|
int timeout = interval + margin;
|
|
int ret = ioctl(fd, WDIOC_SETTIMEOUT, &timeout);
|
|
if (ret) {
|
|
PLOG(ERROR) << "Failed to set timeout to " << timeout;
|
|
ret = ioctl(fd, WDIOC_GETTIMEOUT, &timeout);
|
|
if (ret) {
|
|
PLOG(ERROR) << "Failed to get timeout";
|
|
} else {
|
|
if (timeout > margin) {
|
|
interval = timeout - margin;
|
|
} else {
|
|
interval = 1;
|
|
}
|
|
LOG(WARNING) << "Adjusted interval to timeout returned by driver: "
|
|
<< "timeout " << timeout
|
|
<< ", interval " << interval
|
|
<< ", margin " << margin;
|
|
}
|
|
}
|
|
|
|
while (true) {
|
|
write(fd, "", 1);
|
|
sleep(interval);
|
|
}
|
|
}
|
|
|
|
} // namespace init
|
|
} // namespace android
|