openharmony/appexecfwk_standard
1
0
Fork 0
mirror of https://gitee.com/openharmony/appexecfwk_standard synced 2024-11-23 21:20:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!855 修复libeventhandler codex问题

Browse Source 
Merge pull request !855 from JayLeeHW/codex
This commit is contained in:
openharmony_ci 2022-03-07 11:43:04 +00:00 committed by Gitee
commit 8279f9e6d4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/libeventhandler/src/epoll_io_waiter.cpp
View File

@ -70,7 +70,7 @@ bool EpollIoWaiter::Init()
epollFd = epoll_create(MAX_EPOLL_EVENTS_SIZE);
if (epollFd < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("Init: Failed to create epoll, %{public}s", errmsg);
break;
}
@ -78,7 +78,7 @@ bool EpollIoWaiter::Init()
awakenFd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
if (awakenFd < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("Init: Failed to create event fd, %{public}s", errmsg);
break;
}
@ -86,7 +86,7 @@ bool EpollIoWaiter::Init()
// Add readable file descriptor of pipe, used to wake up blocked thread.
if (EpollCtrl(epollFd, EPOLL_CTL_ADD, awakenFd, EPOLLIN | EPOLLET) < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("Init: Failed to add awaken file descriptor into epoll, %{public}s", errmsg);
break;
}
@ -134,7 +134,7 @@ bool EpollIoWaiter::WaitFor(std::unique_lock<std::mutex> &lock, int64_t nanoseco
bool result = true;
if (retVal < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("WaitFor: Failed to wait epoll, %{public}s", errmsg);
result = false;
} else {
@ -195,7 +195,7 @@ void EpollIoWaiter::NotifyAll()
ssize_t retVal = write(awakenFd_, &increment, sizeof(increment));
if (retVal < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("NotifyAll: Failed to write data into awaken pipe, %{public}s", errmsg);
}
}
@ -229,7 +229,7 @@ bool EpollIoWaiter::AddFileDescriptor(int32_t fileDescriptor, uint32_t events)
if (EpollCtrl(epollFd_, EPOLL_CTL_ADD, fileDescriptor, epollEvents) < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("AddFileDescriptor: Failed to add file descriptor into epoll, %{public}s", errmsg);
return false;
}
@ -251,7 +251,7 @@ void EpollIoWaiter::RemoveFileDescriptor(int32_t fileDescriptor)
if (EpollCtrl(epollFd_, EPOLL_CTL_DEL, fileDescriptor, 0) < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("RemoveFileDescriptor: Failed to remove file descriptor from epoll, %{public}s", errmsg);
return;
}
@ -263,7 +263,7 @@ void EpollIoWaiter::DrainAwakenPipe() const
ssize_t retVal = read(awakenFd_, &value, sizeof(value));
if (retVal < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("DrainAwakenPipe: Failed to read data from awaken pipe, %{public}s", errmsg);
}
}

2
libs/libeventhandler/src/event_runner.cpp
View File

@ -40,7 +40,7 @@ inline void SystemCallSetThreadName(const std::string &name)
{
if (prctl(PR_SET_NAME, name.c_str()) < 0) {
char errmsg[MAX_ERRORMSG_LEN] = {0};
GetLastErr(errmsg);
GetLastErr(errmsg, MAX_ERRORMSG_LEN);
HILOGE("SystemCallSetThreadName: Failed to set thread name, %{public}s", errmsg);
}
}