openharmony/startup_appspawn
1
0
Fork 0
mirror of https://gitee.com/openharmony/startup_appspawn synced 2024-11-22 22:50:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add retry when reading from a socketfd

Browse Source 
Signed-off-by: nianyuu <zhouwenqiang12@huawei.com>
This commit is contained in:
nianyuu 2024-11-19 21:37:27 +08:00
parent 3855680d79
commit ce2294bee6
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
interfaces/innerkits/client/appspawn_client.c
View File

@ -152,15 +152,28 @@ APPSPAWN_STATIC int UpdateSocketTimeout(uint32_t timeout, int socketFd)
return ret;
}
static int ReadMessage(int socketFd, uint32_t sendMsgId, uint8_t *buf, int len, AppSpawnResult *result)
static int ReadMessage(int socketFd, uint8_t *buf, int len, AppSpawnReqMsgNode *reqNode, AppSpawnResult *result)
{
struct timespec readStart = { 0 };
clock_gettime(CLOCK_MONOTONIC, &readStart);
ssize_t rLen = TEMP_FAILURE_RETRY(read(socketFd, buf, len));
if (rLen == -1 && errno == EAGAIN) {
struct timespec readEnd = { 0 };
clock_gettime(CLOCK_MONOTONIC, &readEnd);
uint64_t diff = DiffTime(&readStart, &readEnd);
uint64_t timeout = reqNode->isAsan ? COLDRUN_READ_RETRY_TIME : NORMAL_READ_RETRY_TIME;
// If difftime is greater than timeout, it is considered that system hibernation or a time jump has occurred
if (diff > timeout) {
APPSPAWN_LOGW("Read message again from fd %{public}d, difftime %{public}" PRId64 " us", socketFd, diff);
rLen = TEMP_FAILURE_RETRY(read(socketFd, buf, len));
}
}
APPSPAWN_CHECK(rLen >= 0, return APPSPAWN_TIMEOUT,
"Read message from fd %{public}d rLen %{public}zd errno: %{public}d", socketFd, rLen, errno);
if ((size_t)rLen >= sizeof(AppSpawnResponseMsg)) {
AppSpawnResponseMsg *msg = (AppSpawnResponseMsg *)(buf);
APPSPAWN_CHECK_ONLY_LOG(sendMsgId == msg->msgHdr.msgId,
"Invalid msg recvd %{public}u %{public}u", sendMsgId, msg->msgHdr.msgId);
APPSPAWN_CHECK_ONLY_LOG(reqNode->msg->msgId == msg->msgHdr.msgId,
"Invalid msg recvd %{public}u %{public}u", reqNode->msg->msgId, msg->msgHdr.msgId);
return memcpy_s(result, sizeof(AppSpawnResult), &msg->result, sizeof(msg->result));
}
return APPSPAWN_TIMEOUT;
@ -274,8 +287,7 @@ static int ClientSendMsg(AppSpawnReqMsgMgr *reqMgr, AppSpawnReqMsgNode *reqNode,
}
int ret = HandleMsgSend(reqMgr, reqMgr->socketId, reqNode);
if (ret == 0) {
ret = ReadMessage(reqMgr->socketId, reqNode->msg->msgId,
reqMgr->recvBlock.buffer, reqMgr->recvBlock.blockSize, result);
ret = ReadMessage(reqMgr->socketId, reqMgr->recvBlock.buffer, reqMgr->recvBlock.blockSize, reqNode, result);
}
if (ret == 0) {
if (isColdRun && reqMgr->timeout < ASAN_TIMEOUT) {

3
interfaces/innerkits/client/appspawn_client.h
View File

@ -37,6 +37,9 @@ extern "C" {
#define RETRY_TIME (200 * 1000) // 200 * 1000 wait 200ms CONNECT_RETRY_DELAY = 200 * 1000
#define MAX_RETRY_SEND_COUNT 2 // 2 max retry count CONNECT_RETRY_MAX_TIMES = 2;
#define NORMAL_READ_RETRY_TIME (3 * 1000 * 1000 + 500 * 1000) // 3.5s, Exceed WAIT_CHILD_RESPONSE_TIMEOUT by 0.5s
#define COLDRUN_READ_RETRY_TIME (5 * 1000 * 1000 + 500 * 1000) // 5.5s, Exceed COLD_CHILD_RESPONSE_TIMEOUT by 0.5s
// only used for ExternalFileManager.hap
#define GID_FILE_ACCESS 1006
#define GID_USER_DATA_RW 1008

2
standard/appspawn_service.c
View File

@ -549,7 +549,7 @@ static void ProcessChildProcessFd(const WatcherHandle taskHandle, int fd, uint32
{
APPSPAWN_CHECK_ONLY_EXPER(context != NULL, return);
pid_t pid = *(pid_t *)context;
APPSPAWN_LOGI("Kill process group with process group id %{public}d, pidFd %{public}d", pid, fd);
APPSPAWN_LOGI("Clear process group with pid %{public}d, pidFd %{public}d", pid, fd);
AppSpawnedProcess *appInfo = GetSpawnedProcess(pid);
if (appInfo == NULL) {
APPSPAWN_LOGW("Cannot get app info by bundle name: %{public}d", pid);