yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!612 代码检视意见清零 

Merge pull request !612 from JerryH/pipe_poll
This commit is contained in:
openharmony_ci 2022-03-03 07:01:44 +00:00 committed by Gitee
parent 7688a3f52d c5a3ed4fb1
commit ea5b2e8ae4
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kal/posix/src/pipe.c
View File

@ -174,7 +174,7 @@ STATIC size_t PipeRingbufferRead(struct PipeDev *dev, VOID *buf, size_t len)
} }
} }
nbytes = (nbytes > len) ? len : nbytes; nbytes = (nbytes > len) ? len : nbytes;
(VOID)memcpy_s((char *)buf, len, dev->ringBuffer + dev->readIndex, nbytes); (VOID)memcpy_s(buf, len, dev->ringBuffer + dev->readIndex, nbytes);
dev->readIndex += nbytes; dev->readIndex += nbytes;
if (dev->readIndex >= dev->bufferSize) { if (dev->readIndex >= dev->bufferSize) {
dev->readIndex = 0; dev->readIndex = 0;
@ -184,7 +184,7 @@ STATIC size_t PipeRingbufferRead(struct PipeDev *dev, VOID *buf, size_t len)
return nbytes; return nbytes;
} }
STATIC size_t PipeRingbufferWrite(struct PipeDev *dev, VOID *buf, size_t len) STATIC size_t PipeRingbufferWrite(struct PipeDev *dev, const VOID *buf, size_t len)
{ {
size_t nbytes; size_t nbytes;
@ -220,7 +220,6 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
return -ENODEV; return -ENODEV;
} }
struct PipeDev *devTemp = NULL;
struct PipeDev *dev = LOS_MemAlloc(OS_SYS_MEM_ADDR, sizeof(struct PipeDev)); struct PipeDev *dev = LOS_MemAlloc(OS_SYS_MEM_ADDR, sizeof(struct PipeDev));
if (dev == NULL) { if (dev == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
@ -230,7 +229,7 @@ STATIC INT32 PipeDevRegister(CHAR *devName, UINT32 len)
(VOID)snprintf_s(dev->devName, PIPE_DEV_NAME_MAX, PIPE_DEV_NAME_MAX - 1, "%s%d", PIPE_DEV_PATH, num); (VOID)snprintf_s(dev->devName, PIPE_DEV_NAME_MAX, PIPE_DEV_NAME_MAX - 1, "%s%d", PIPE_DEV_PATH, num);
(VOID)memcpy_s(devName, len, dev->devName, strlen(dev->devName)); (VOID)memcpy_s(devName, len, dev->devName, strlen(dev->devName));
devTemp = PipeDevFind(dev->devName); struct PipeDev *devTemp = PipeDevFind(dev->devName);
if (devTemp != NULL) { if (devTemp != NULL) {
ret = -EEXIST; ret = -EEXIST;
goto ERROR; goto ERROR;
@ -389,22 +388,15 @@ INT32 PipeOpen(const CHAR *path, INT32 openFlag, INT32 minFd)
dev->ringBuffer = LOS_MemAlloc(OS_SYS_MEM_ADDR, PIPE_DEV_BUF_SIZE); dev->ringBuffer = LOS_MemAlloc(OS_SYS_MEM_ADDR, PIPE_DEV_BUF_SIZE);
if (dev->ringBuffer == NULL) { if (dev->ringBuffer == NULL) {
PIPE_DEV_UNLOCK(dev->mutex); PIPE_DEV_UNLOCK(dev->mutex);
PipeDevFdFree(fd);
errno = ENOMEM; errno = ENOMEM;
goto ERROR; return -1;
} }
dev->bufferSize = PIPE_DEV_BUF_SIZE; dev->bufferSize = PIPE_DEV_BUF_SIZE;
} }
PIPE_DEV_UNLOCK(dev->mutex); PIPE_DEV_UNLOCK(dev->mutex);
return (fd + minFd); return (fd + minFd);
ERROR:
if (dev->ringBuffer != NULL) {
(VOID)LOS_MemFree(OS_SYS_MEM_ADDR, dev->ringBuffer);
dev->ringBuffer = NULL;
}
PipeDevFdFree(fd);
return -1;
} }
STATIC INLINE struct PipeFdDev *PipeFdDevGet(INT32 fd) STATIC INLINE struct PipeFdDev *PipeFdDevGet(INT32 fd)
@ -448,9 +440,7 @@ INT32 PipeClose(INT32 fd)
PIPE_DEV_LOCK(dev->mutex); PIPE_DEV_LOCK(dev->mutex);
if (openFlag == O_RDONLY) { if (openFlag == O_RDONLY) {
dev->readerCnt--; dev->readerCnt--;
} } else if (openFlag == O_WRONLY) {
if (openFlag == O_WRONLY) {
dev->writerCnt--; dev->writerCnt--;
} }
@ -676,8 +666,19 @@ int pipe(int filedes[2])
return -1; return -1;
} }
struct PipeDev *dev = PipeDevFind(devName);
filedes[0] = open(devName, O_RDONLY); filedes[0] = open(devName, O_RDONLY);
if (filedes[0] < 0) {
(VOID)PipeDevUnregister(dev);
return -1;
}
filedes[1] = open(devName, O_WRONLY); filedes[1] = open(devName, O_WRONLY);
if (filedes[1] < 0) {
(VOID)PipeDevUnregister(dev);
(VOID)close(filedes[0]);
return -1;
}
return 0; return 0;
} }

4
kal/posix/src/poll.c
View File

@ -128,6 +128,10 @@ VOID PollNotify(struct PollWaitQueue *waitQueue, PollEvent event)
UINT32 intSave; UINT32 intSave;
struct PollWaitNode *waitNode = NULL; struct PollWaitNode *waitNode = NULL;
if (waitQueue == NULL) {
return;
}
intSave = LOS_IntLock(); intSave = LOS_IntLock();
LOS_DL_LIST_FOR_EACH_ENTRY(waitNode, &waitQueue->queue, struct PollWaitNode, node) { LOS_DL_LIST_FOR_EACH_ENTRY(waitNode, &waitQueue->queue, struct PollWaitNode, node) {
if (!event || (event & waitNode->table->event)) { if (!event || (event & waitNode->table->event)) {