openharmony/miscservices_time
1
0
Fork 0
mirror of https://github.com/openharmony/miscservices_time.git synced 2026-07-19 12:02:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

修改定时器和hostbyname

Browse Source 
Signed-off-by: guduhanyan <xuyanjun27@163.com>
This commit is contained in:
liulinna
2022-03-17 06:04:05 +08:00
committed by guduhanyan
parent 0d7b772d25
commit eb1b3ddaee
5 changed files with 63 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/time_manager/include/time_tick_notify.h
+6 -3
View File
@@ -17,21 +17,24 @@
#define TIME_TICK_NOTIFY_H
#include <singleton.h>
#include "timer.h"
namespace OHOS {
namespace MiscServices {
class TimeTickNotify : public DelayedSingleton<TimeTickNotify> {
DECLARE_DELAYED_SINGLETON(TimeTickNotify);
public:
TimeTickNotify();
~TimeTickNotify();
DISALLOW_COPY_AND_MOVE(TimeTickNotify);
void Init();
void Callback(const uint64_t timerid);
void Callback();
void Stop();
private:
void StartTimer();
void RefreshNextTriggerTime();
uint64_t GetMillisecondsFromUTC(uint64_t UTCtimeNano);
uint64_t timerId_;
Utils::Timer timer_;
uint32_t timerId_;
uint64_t nextTriggerTime_;
};
} // MiscServices
services/time_manager/src/ntp_trusted_time.cpp
+13 -2
View File
@@ -46,8 +46,19 @@ bool NtpTrustedTime::ForceRefresh(std::string ntpServer)
TIME_HILOGD(TIME_MODULE_SERVICE, "true end.");
return true;
} else {
TIME_HILOGD(TIME_MODULE_SERVICE, "false end.");
return false;
if (client.RequestTime(ntpServer)) {
if (mTimeResult != nullptr) {
mTimeResult->Clear();
}
ntpCertainty = client.getRoundTripTime() / 2;
mTimeResult = std::make_shared<TimeResult>(client.getNtpTIme(), client.getNtpTimeReference(), ntpCertainty);
TIME_HILOGD(TIME_MODULE_SERVICE, "Re Get Ntp time result");
TIME_HILOGD(TIME_MODULE_SERVICE, "Re true end.");
return true;
} else {
TIME_HILOGD(TIME_MODULE_SERVICE, "false end.");
return false;
}
}
}
services/time_manager/src/ntp_update_time.cpp
+1 -9
View File
@@ -68,7 +68,7 @@ void NtpUpdateTime::Init()
auto callback = [this](uint64_t id) {
this->RefreshNetworkTimeByTimer(id);
};
timerId_ = TimeService::GetInstance()->CreateTimer(timerType, 0, 0, 0, callback);
timerId_ = TimeService::GetInstance()->CreateTimer(timerType, 0, DAY_TO_MILLISECOND, 0, callback);
TIME_HILOGD(TIME_MODULE_SERVICE, "Ntp update timerId: %{public}" PRId64 "", timerId_);
RefreshNextTriggerTime();
TIME_HILOGD(TIME_MODULE_SERVICE, "Ntp update triggertime: %{public}" PRId64 "", nextTriggerTime_);
@@ -103,13 +103,6 @@ void NtpUpdateTime::RefreshNetworkTimeByTimer(const uint64_t timerId)
}
SetSystemTime();
SaveAutoTimeInfoToFile(autoTimeInfo_);
timerId_ = timerId;
RefreshNextTriggerTime();
auto startFunc = [this]() {
this->StartTimer();
};
std::thread startTimerThread(startFunc);
startTimerThread.detach();
TIME_HILOGD(TIME_MODULE_SERVICE, "Ntp update triggertime: %{public}" PRId64 "", nextTriggerTime_);
}
@@ -152,7 +145,6 @@ void NtpUpdateTime::RefreshNextTriggerTime()
auto BootTimeNano = steady_clock::now().time_since_epoch().count();
auto BootTimeMilli = BootTimeNano / NANO_TO_MILESECOND;
nextTriggerTime_ = BootTimeMilli + DAY_TO_MILLISECOND;
return;
}
void NtpUpdateTime::UpdateStatusOff()
services/time_manager/src/sntp_client.cpp
+21 -31
View File
@@ -44,12 +44,12 @@ namespace {
constexpr int INDEX_TWO = 2;
constexpr int INDEX_THREE = 3;
constexpr int INDEX_FOUR = 4;
constexpr int TIME_OUT = 5;
constexpr int TIME_OUT = 10;
constexpr unsigned char MODE_THREE = 3;
constexpr unsigned char VERSION_THREE = 3;
constexpr double TEN_TO_MINUS_SIX_POWER = 1.0e-6;
constexpr double TEN_TO_SIX_POWER = 1.0e6;
constexpr int NTP_PORT = 123;
char const *NTP_PORT = "123";
constexpr int NTP_MSG_OFFSET_ROOT_DELAY = 4;
constexpr int NTP_MSG_OFFSET_ROOT_DISPERSION = 8;
constexpr int NTP_MSG_OFFSET_REFERENCE_IDENTIFIER = 12;
@@ -68,44 +68,34 @@ bool SNTPClient::RequestTime(std::string host)
{
TIME_HILOGD(TIME_MODULE_SERVICE, "start.");
int iResult;
struct sockaddr_in RecvAddr;
unsigned short Port = NTP_PORT;
int BufLen = NTP_PACKAGE_SIZE;
// Create a socket for sending data
int SendSocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (SendSocket == 0) {
TIME_HILOGE(TIME_MODULE_SERVICE, "socket failed with error: %{public}d", 0);
struct addrinfo hints = {0}, *addrs;
hints.ai_family = AF_INET;
hints.ai_socktype = SOCK_DGRAM;
hints.ai_protocol = IPPROTO_UDP;
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime1.");
int status = getaddrinfo(host.c_str(), NTP_PORT, &hints, &addrs);
if (status != 0) {
TIME_HILOGE(TIME_MODULE_SERVICE, "getaddrinfo failed");
return false;
}
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime1.");
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime2.");
// Create a socket for sending data
int SendSocket = socket(addrs->ai_family, addrs->ai_socktype, addrs->ai_protocol);
if (SendSocket == 0) {
TIME_HILOGE(TIME_MODULE_SERVICE, "create socket failed");
return false;
}
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime3.");
// Set send and recv function timeout
struct timeval timeout = {TIME_OUT, 0};
setsockopt(SendSocket, SOL_SOCKET, SO_SNDTIMEO, (char *)&timeout, sizeof(struct timeval));
setsockopt(SendSocket, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(struct timeval));
struct hostent* hostV;
if ((hostV = gethostbyname(host.c_str())) == nullptr) {
// More descriptive error message
TIME_HILOGE(TIME_MODULE_SERVICE, "Get host by name %{public}s but get nullptr.", host.c_str());
return false;
}
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime2.");
errno_t ret = memset_s((char*)& RecvAddr, sizeof(RecvAddr), 0, sizeof(RecvAddr));
if (ret != EOK) {
TIME_HILOGE(TIME_MODULE_SERVICE, "memcpy_s failed, err = %d\n", ret);
return false;
}
RecvAddr.sin_family = AF_INET;
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime3.");
ret = memcpy_s((char*)& RecvAddr.sin_addr.s_addr, hostV->h_length, (char*)hostV->h_addr, hostV->h_length);
if (ret != EOK) {
TIME_HILOGE(TIME_MODULE_SERVICE, "memcpy_s failed, err = %d\n", ret);
return false;
}
RecvAddr.sin_port = htons(Port);
if (connect(SendSocket, (struct sockaddr*) & RecvAddr, sizeof(RecvAddr)) < 0) {
TIME_HILOGE(TIME_MODULE_SERVICE, "Connect socket failed with host: %{public}s", host.c_str());
if (connect(SendSocket, addrs->ai_addr, addrs->ai_addrlen) < 0) {
TIME_HILOGE(TIME_MODULE_SERVICE, "socket connect failed");
return false;
}
TIME_HILOGD(TIME_MODULE_SERVICE, "RequestTime4.");
services/time_manager/src/time_tick_notify.cpp
+22 -25
View File
@@ -21,6 +21,8 @@
#include "timer_manager_interface.h"
#include "time_service.h"
#include "time_tick_notify.h"
#include "common_timer_errors.h"
using namespace std::chrono;
namespace OHOS {
@@ -28,38 +30,41 @@ namespace MiscServices {
namespace {
constexpr uint64_t MINUTE_TO_MILLISECOND = 60000;
constexpr uint64_t MICRO_TO_MILESECOND = 1000;
constexpr uint64_t NANO_TO_MILESECOND = 1000000;
}
TimeTickNotify::TimeTickNotify() {};
TimeTickNotify::TimeTickNotify() : timer_("TickTimer") {};
TimeTickNotify::~TimeTickNotify() {};
void TimeTickNotify::Init()
{
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick notify start.");
int32_t timerType = ITimerManager::TimerType::ELAPSED_REALTIME;
auto callback = [this](uint64_t id) {
this->Callback(id);
uint32_t ret = timer_.Setup();
if (ret != Utils::TIMER_ERR_OK) {
TIME_HILOGE(TIME_MODULE_SERVICE, "Timer Setup failed: %{public}d", ret);
return;
}
auto callback = [this]() {
this->Callback();
};
timerId_ = TimeService::GetInstance()->CreateTimer(timerType, 0, 0, 0, callback);
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick notify timerId: %{public}" PRId64 "", timerId_);
RefreshNextTriggerTime();
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick notify triggertime: %{public}" PRId64 "", nextTriggerTime_);
TimeService::GetInstance()->StartTimer(timerId_, nextTriggerTime_);
timerId_ = timer_.Register(callback, nextTriggerTime_);
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick timer ID: %{public}d", timerId_);
}
void TimeTickNotify::Callback(const uint64_t timerId)
void TimeTickNotify::Callback()
{
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick notify timerId: %{public}" PRId64 "", timerId);
auto currentTime = steady_clock::now().time_since_epoch().count();
DelayedSingleton<TimeServiceNotify>::GetInstance()->PublishTimeTickEvents(currentTime);
timerId_ = timerId;
timer_.Unregister(timerId_);
RefreshNextTriggerTime();
auto startFunc = [this]() {
this->StartTimer();
auto callback = [this]() {
this->Callback();
};
std::thread startTimerThread(startFunc);
startTimerThread.detach();
timerId_ = timer_.Register(callback, nextTriggerTime_);
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick notify triggertime: %{public}" PRId64 "", nextTriggerTime_);
TIME_HILOGD(TIME_MODULE_SERVICE, "Tick timer ID: %{public}d", timerId_);
}
void TimeTickNotify::RefreshNextTriggerTime()
@@ -69,22 +74,14 @@ void TimeTickNotify::RefreshNextTriggerTime()
TIME_HILOGI(TIME_MODULE_SERVICE, "Time now: %{public}s", asctime(tblock));
auto UTCTimeMicro = duration_cast<microseconds>(system_clock::now().time_since_epoch()).count();
TIME_HILOGD(TIME_MODULE_SERVICE, "Time Now Mirc: %{public}" PRId64 "", UTCTimeMicro);
auto BootTimeNano = steady_clock::now().time_since_epoch().count();
auto BootTimeMilli = BootTimeNano / NANO_TO_MILESECOND;
auto timeMilliseconds = GetMillisecondsFromUTC(UTCTimeMicro);
nextTriggerTime_ = BootTimeMilli + (MINUTE_TO_MILLISECOND - timeMilliseconds);
return ;
}
void TimeTickNotify::StartTimer()
{
TimeService::GetInstance()->StartTimer(timerId_, nextTriggerTime_);
nextTriggerTime_ = MINUTE_TO_MILLISECOND - timeMilliseconds;
}
void TimeTickNotify::Stop()
{
TIME_HILOGD(TIME_MODULE_SERVICE, "start.");
TimeService::GetInstance()->DestroyTimer(timerId_);
timer_.Shutdown();
}
uint64_t TimeTickNotify::GetMillisecondsFromUTC(uint64_t UTCtimeMicro)