Compare commits
12 Commits
OpenHarmon
...
weekly_202
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e7daa28200 | ||
|
|
987a722d2d | ||
|
|
ccdfa72431 | ||
|
|
557a71c1c3 | ||
|
|
569aecb6ea | ||
|
|
8c0b7d0f38 | ||
|
|
c488817b32 | ||
|
|
43d47a27e3 | ||
|
|
a83f916298 | ||
|
|
8dbfd3846e | ||
|
|
f34762c105 | ||
|
|
043e84dfcb |
@@ -180,7 +180,8 @@ static void LmsStrcpyTest(void)
|
||||
return;
|
||||
}
|
||||
char *testStr = "bbbbbbbbbbbbbbbbb";
|
||||
printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n", strlen(testStr) + 1);
|
||||
printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n",
|
||||
(int)strlen(testStr) + 1);
|
||||
strcpy(buf, testStr);
|
||||
free(buf);
|
||||
printf("\n-------- LmsStrcpyTest End --------\n");
|
||||
|
||||
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
|
||||
PerfStop(fd);
|
||||
} else if ((argc == THREE_ARGS) && strcmp(argv[1], "read") == 0) {
|
||||
size_t size = strtoul(argv[THREE_ARGS - 1], NULL, 0);
|
||||
if (size <= 0) {
|
||||
if (size == 0) {
|
||||
goto EXIT:
|
||||
}
|
||||
|
||||
|
||||
@@ -1437,10 +1437,8 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,
|
||||
{
|
||||
s32_t iSockNum = TFTP_NULL_INT32;
|
||||
u32_t ulSrcStrLen;
|
||||
u32_t lDestStrLen;
|
||||
u32_t ulSize;
|
||||
u32_t ulRecvSize = TFTP_NULL_UINT32;
|
||||
s32_t iErrCode;
|
||||
u32_t ulErrCode;
|
||||
u16_t usReadReq;
|
||||
u16_t usTempServPort;
|
||||
|
||||
@@ -70,7 +70,7 @@ static void TraceRead(int fd, size_t size)
|
||||
{
|
||||
ssize_t i;
|
||||
ssize_t len;
|
||||
if (size <= 0) {
|
||||
if (size == 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1409,7 +1409,7 @@ DWORD fattime_format(time_t time)
|
||||
ftime |= ((DWORD)((st.tm_year > YEAR_OFFSET) ? (st.tm_year - YEAR_OFFSET) : 0)) << FTIME_YEAR_OFFSET;
|
||||
ftime <<= FTIME_DATE_OFFSET;
|
||||
|
||||
ftime = (DWORD)st.tm_sec / SEC_MULTIPLIER;
|
||||
ftime |= (DWORD)st.tm_sec / SEC_MULTIPLIER;
|
||||
ftime |= ((DWORD)st.tm_min) << FTIME_MIN_OFFSET;
|
||||
ftime |= ((DWORD)st.tm_hour) << FTIME_HR_OFFSET;
|
||||
|
||||
@@ -2167,7 +2167,7 @@ int fatfs_symlink(struct Vnode *parentVnode, struct Vnode **newVnode, const char
|
||||
ssize_t fatfs_readlink(struct Vnode *vnode, char *buffer, size_t bufLen)
|
||||
{
|
||||
int ret;
|
||||
FRESULT res = FR_OK;
|
||||
FRESULT res;
|
||||
DWORD clust;
|
||||
QWORD sect;
|
||||
DIR_FILE *dfp = (DIR_FILE *)(vnode->data);
|
||||
|
||||
@@ -2311,7 +2311,7 @@ diff -Nupr old/fs/jffs2/erase.c new/fs/jffs2/erase.c
|
||||
diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
--- old/fs/jffs2/file.c 2022-05-09 17:22:53.000000000 +0800
|
||||
+++ new/fs/jffs2/file.c 2022-05-10 09:43:14.250000000 +0800
|
||||
@@ -9,325 +9,34 @@
|
||||
@@ -9,335 +9,30 @@
|
||||
* For licensing information, see the file 'LICENCE' in this directory.
|
||||
*
|
||||
*/
|
||||
@@ -2336,32 +2336,35 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- loff_t pos, unsigned len, unsigned flags,
|
||||
- struct page **pagep, void **fsdata);
|
||||
-static int jffs2_readpage (struct file *filp, struct page *pg);
|
||||
-
|
||||
-int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
|
||||
-{
|
||||
- struct inode *inode = filp->f_mapping->host;
|
||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||
- int ret;
|
||||
-
|
||||
- ret = file_write_and_wait_range(filp, start, end);
|
||||
- if (ret)
|
||||
- return ret;
|
||||
|
||||
- inode_lock(inode);
|
||||
- /* Trigger GC to flush any pending writes for this inode */
|
||||
- jffs2_flush_wbuf_gc(c, inode->i_ino);
|
||||
- inode_unlock(inode);
|
||||
+static unsigned char gc_buffer[PAGE_SIZE]; //avoids malloc when user may be under memory pressure
|
||||
|
||||
- return 0;
|
||||
-}
|
||||
|
||||
-const struct file_operations jffs2_file_operations =
|
||||
-int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
|
||||
+unsigned char *jffs2_gc_fetch_page(struct jffs2_sb_info *c,
|
||||
+ struct jffs2_inode_info *f,
|
||||
+ unsigned long offset,
|
||||
+ unsigned long *priv)
|
||||
{
|
||||
- struct inode *inode = filp->f_mapping->host;
|
||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||
+ /* FIXME: This works only with one file system mounted at a time */
|
||||
int ret;
|
||||
-
|
||||
- ret = file_write_and_wait_range(filp, start, end);
|
||||
+ ret = jffs2_read_inode_range(c, f, gc_buffer,
|
||||
+ offset & ~(PAGE_SIZE-1), PAGE_SIZE);
|
||||
if (ret)
|
||||
- return ret;
|
||||
-
|
||||
- inode_lock(inode);
|
||||
- /* Trigger GC to flush any pending writes for this inode */
|
||||
- jffs2_flush_wbuf_gc(c, inode->i_ino);
|
||||
- inode_unlock(inode);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-const struct file_operations jffs2_file_operations =
|
||||
-{
|
||||
- .llseek = generic_file_llseek,
|
||||
- .open = generic_file_open,
|
||||
- .read_iter = generic_file_read_iter,
|
||||
@@ -2395,9 +2398,8 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
|
||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||
- unsigned char *pg_buf;
|
||||
+ /* FIXME: This works only with one file system mounted at a time */
|
||||
int ret;
|
||||
|
||||
- int ret;
|
||||
-
|
||||
- jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n",
|
||||
- __func__, inode->i_ino, pg->index << PAGE_SHIFT);
|
||||
-
|
||||
@@ -2436,18 +2438,15 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
-{
|
||||
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host);
|
||||
- int ret;
|
||||
+ ret = jffs2_read_inode_range(c, f, gc_buffer,
|
||||
+ offset & ~(PAGE_SIZE-1), PAGE_SIZE);
|
||||
+ if (ret)
|
||||
+ return ERR_PTR(ret);
|
||||
|
||||
-
|
||||
- mutex_lock(&f->sem);
|
||||
- ret = jffs2_do_readpage_unlock(pg->mapping->host, pg);
|
||||
- mutex_unlock(&f->sem);
|
||||
- return ret;
|
||||
+ return ERR_PTR(ret);
|
||||
+ return gc_buffer;
|
||||
}
|
||||
-
|
||||
|
||||
-static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
|
||||
- loff_t pos, unsigned len, unsigned flags,
|
||||
- struct page **pagep, void **fsdata)
|
||||
@@ -2458,20 +2457,15 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- struct page *pg;
|
||||
- struct inode *inode = mapping->host;
|
||||
- struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
|
||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||
- pgoff_t index = pos >> PAGE_SHIFT;
|
||||
- uint32_t pageofs = index << PAGE_SHIFT;
|
||||
- int ret = 0;
|
||||
-
|
||||
- pg = grab_cache_page_write_begin(mapping, index, flags);
|
||||
- if (!pg)
|
||||
- return -ENOMEM;
|
||||
- *pagep = pg;
|
||||
-
|
||||
- jffs2_dbg(1, "%s()\n", __func__);
|
||||
-
|
||||
- if (pageofs > inode->i_size) {
|
||||
- /* Make new hole frag from old EOF to new page */
|
||||
- struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
|
||||
- struct jffs2_raw_inode ri;
|
||||
- struct jffs2_full_dnode *fn;
|
||||
- uint32_t alloc_len;
|
||||
@@ -2482,7 +2476,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len,
|
||||
- ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE);
|
||||
- if (ret)
|
||||
- goto out_page;
|
||||
- goto out_err;
|
||||
-
|
||||
- mutex_lock(&f->sem);
|
||||
- memset(&ri, 0, sizeof(ri));
|
||||
@@ -2512,7 +2506,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- ret = PTR_ERR(fn);
|
||||
- jffs2_complete_reservation(c);
|
||||
- mutex_unlock(&f->sem);
|
||||
- goto out_page;
|
||||
- goto out_err;
|
||||
- }
|
||||
- ret = jffs2_add_full_dnode_to_inode(c, f, fn);
|
||||
- if (f->metadata) {
|
||||
@@ -2527,7 +2521,7 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- jffs2_free_full_dnode(fn);
|
||||
- jffs2_complete_reservation(c);
|
||||
- mutex_unlock(&f->sem);
|
||||
- goto out_page;
|
||||
- goto out_err;
|
||||
- }
|
||||
- jffs2_complete_reservation(c);
|
||||
- inode->i_size = pageofs;
|
||||
@@ -2535,6 +2529,19 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- }
|
||||
-
|
||||
- /*
|
||||
- * While getting a page and reading data in, lock c->alloc_sem until
|
||||
- * the page is Uptodate. Otherwise GC task may attempt to read the same
|
||||
- * page in read_cache_page(), which causes a deadlock.
|
||||
- */
|
||||
- mutex_lock(&c->alloc_sem);
|
||||
- pg = grab_cache_page_write_begin(mapping, index, flags);
|
||||
- if (!pg) {
|
||||
- ret = -ENOMEM;
|
||||
- goto release_sem;
|
||||
- }
|
||||
- *pagep = pg;
|
||||
-
|
||||
- /*
|
||||
- * Read in the page if it wasn't already present. Cannot optimize away
|
||||
- * the whole page write case until jffs2_write_end can handle the
|
||||
- * case of a short-copy.
|
||||
@@ -2543,19 +2550,20 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- mutex_lock(&f->sem);
|
||||
- ret = jffs2_do_readpage_nolock(inode, pg);
|
||||
- mutex_unlock(&f->sem);
|
||||
- if (ret)
|
||||
- goto out_page;
|
||||
- if (ret) {
|
||||
- unlock_page(pg);
|
||||
- put_page(pg);
|
||||
- goto release_sem;
|
||||
- }
|
||||
- }
|
||||
- jffs2_dbg(1, "end write_begin(). pg->flags %lx\n", pg->flags);
|
||||
- return ret;
|
||||
-
|
||||
-out_page:
|
||||
- unlock_page(pg);
|
||||
- put_page(pg);
|
||||
-release_sem:
|
||||
- mutex_unlock(&c->alloc_sem);
|
||||
-out_err:
|
||||
- return ret;
|
||||
+ /* Do nothing */
|
||||
}
|
||||
|
||||
-}
|
||||
-
|
||||
-static int jffs2_write_end(struct file *filp, struct address_space *mapping,
|
||||
- loff_t pos, unsigned len, unsigned copied,
|
||||
- struct page *pg, void *fsdata)
|
||||
@@ -2653,7 +2661,8 @@ diff -Nupr old/fs/jffs2/file.c new/fs/jffs2/file.c
|
||||
- unlock_page(pg);
|
||||
- put_page(pg);
|
||||
- return writtenlen > 0 ? writtenlen : ret;
|
||||
-}
|
||||
+ /* Do nothing */
|
||||
}
|
||||
diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
|
||||
--- old/fs/jffs2/fs.c 2022-05-09 17:22:53.000000000 +0800
|
||||
+++ new/fs/jffs2/fs.c 2022-05-10 16:13:37.830000000 +0800
|
||||
|
||||
@@ -780,7 +780,6 @@ ssize_t VfsJffs2Readlink(struct Vnode *vnode, char *buffer, size_t bufLen)
|
||||
|
||||
cnt = (bufLen - 1) < targetLen ? (bufLen - 1) : targetLen;
|
||||
if (LOS_CopyFromKernel(buffer, bufLen, (const char *)f->target, cnt) != 0) {
|
||||
cnt = 0;
|
||||
LOS_MuxUnlock(&g_jffs2FsLock);
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
@@ -581,8 +581,8 @@ static OsBcacheBlock *AllocNewBlock(OsBcache *bc, BOOL read, UINT64 num)
|
||||
DelBlock(bc, prefer);
|
||||
}
|
||||
|
||||
if (prefer->used) {
|
||||
MergeSyncBlocks(bc, prefer);
|
||||
if (prefer->used) { /* do not combine with next check */
|
||||
MergeSyncBlocks(bc, prefer); /* prefer->used may be changed here */
|
||||
}
|
||||
|
||||
if (prefer->used) {
|
||||
|
||||
@@ -160,7 +160,7 @@ typedef int VfsHashCmp(struct Vnode *vnode, void *arg);
|
||||
|
||||
int VnodesInit(void);
|
||||
int VnodeDevInit(void);
|
||||
int VnodeAlloc(struct VnodeOps *vop, struct Vnode **vnode);
|
||||
int VnodeAlloc(struct VnodeOps *vop, struct Vnode **newVnode);
|
||||
int VnodeFree(struct Vnode *vnode);
|
||||
int VnodeLookup(const char *path, struct Vnode **vnode, uint32_t flags);
|
||||
int VnodeLookupFullpath(const char *fullpath, struct Vnode **vnode, uint32_t flags);
|
||||
|
||||
@@ -353,7 +353,7 @@ static struct file_operations_vfs g_errorFileOps = {
|
||||
.unlink = ErrorFopUnlink,
|
||||
};
|
||||
|
||||
static struct Mount* GetDevMountPoint(struct Vnode *dev)
|
||||
static struct Mount* GetDevMountPoint(const struct Vnode *dev)
|
||||
{
|
||||
struct Mount *mnt = NULL;
|
||||
LIST_HEAD *mntList = GetMountList();
|
||||
@@ -394,7 +394,7 @@ static void FilePreClose(struct file *filep, const struct file_operations_vfs *o
|
||||
}
|
||||
}
|
||||
|
||||
static void FileDisableAndClean(struct Mount *mnt)
|
||||
static void FileDisableAndClean(const struct Mount *mnt)
|
||||
{
|
||||
struct filelist *flist = &tg_filelist;
|
||||
struct file *filep = NULL;
|
||||
@@ -435,7 +435,7 @@ static void VnodeTryFree(struct Vnode *vnode)
|
||||
vnode->fop = &g_errorFileOps;
|
||||
}
|
||||
|
||||
static void VnodeTryFreeAll(struct Mount *mount)
|
||||
static void VnodeTryFreeAll(const struct Mount *mount)
|
||||
{
|
||||
struct Vnode *vnode = NULL;
|
||||
struct Vnode *nextVnode = NULL;
|
||||
|
||||
@@ -66,7 +66,6 @@ static int iov_trans_to_buf(char *buf, ssize_t totallen, const struct iovec *iov
|
||||
} else {
|
||||
writepart = bytestowrite - ret;
|
||||
curbuf += writepart;
|
||||
totallen -= writepart;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -761,11 +761,6 @@ static int os_shell_cmd_do_rmdir(const char *pathname)
|
||||
}
|
||||
if (strcmp(dirent->d_name, "..") && strcmp(dirent->d_name, ".")) {
|
||||
size_t fullpath_buf_size = strlen(pathname) + strlen(dirent->d_name) + SEPARATOR_EOF_LEN;
|
||||
if (fullpath_buf_size <= 0) {
|
||||
PRINTK("buffer size is invalid!\n");
|
||||
(void)closedir(d);
|
||||
return -1;
|
||||
}
|
||||
fullpath = (char *)malloc(fullpath_buf_size);
|
||||
if (fullpath == NULL) {
|
||||
PRINTK("malloc failure!\n");
|
||||
|
||||
@@ -70,7 +70,7 @@ VOID OsVmPhysDump(VOID);
|
||||
VOID OsVmPhysUsedInfoGet(UINT32 *usedCount, UINT32 *totalCount);
|
||||
INT32 OsRegionOverlapCheck(LosVmSpace *space, LosVmMapRegion *region);
|
||||
VOID OsDumpPte(VADDR_T vaddr);
|
||||
LosProcessCB *OsGetPIDByAspace(LosVmSpace *space);
|
||||
LosProcessCB *OsGetPIDByAspace(const LosVmSpace *space);
|
||||
CHAR *OsArchFlagsToStr(const UINT32 archFlags);
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
@@ -193,7 +193,7 @@ VOID OsVmmFileRegionFree(struct file *filep, LosProcessCB *processCB);
|
||||
|
||||
LosFilePage *OsPageCacheAlloc(struct page_mapping *mapping, VM_OFFSET_T pgoff);
|
||||
LosFilePage *OsFindGetEntry(struct page_mapping *mapping, VM_OFFSET_T pgoff);
|
||||
LosMapInfo *OsGetMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr);
|
||||
LosMapInfo *OsGetMapInfo(const LosFilePage *page, const LosArchMmu *archMmu, VADDR_T vaddr);
|
||||
VOID OsAddMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr);
|
||||
VOID OsDelMapInfo(LosVmMapRegion *region, LosVmPgFault *pgFault, BOOL cleanDirty);
|
||||
VOID OsFileCacheFlush(struct page_mapping *mapping);
|
||||
@@ -208,7 +208,7 @@ VOID OsDeletePageCacheLru(LosFilePage *page);
|
||||
VOID OsPageRefDecNoLock(LosFilePage *page);
|
||||
VOID OsPageRefIncLocked(LosFilePage *page);
|
||||
int OsTryShrinkMemory(size_t nPage);
|
||||
VOID OsMarkPageDirty(LosFilePage *fpage, LosVmMapRegion *region, int off, int len);
|
||||
VOID OsMarkPageDirty(LosFilePage *fpage, const LosVmMapRegion *region, int off, int len);
|
||||
|
||||
#ifdef LOSCFG_DEBUG_VERSION
|
||||
VOID ResetPageCacheHitInfo(int *try, int *hit);
|
||||
|
||||
@@ -96,7 +96,7 @@ UINT32 LOS_RwlockDestroy(LosRwlock *rwlock)
|
||||
return LOS_OK;
|
||||
}
|
||||
|
||||
STATIC UINT32 OsRwlockCheck(LosRwlock *rwlock)
|
||||
STATIC UINT32 OsRwlockCheck(const LosRwlock *rwlock)
|
||||
{
|
||||
if (rwlock == NULL) {
|
||||
return LOS_EINVAL;
|
||||
|
||||
@@ -78,7 +78,6 @@ STATIC VOID OsMoveTmpInfoToUnbInfo(sig_cb *sigcb, INT32 signo)
|
||||
/* delete tmpinfo from tmpList. */
|
||||
*prevHook = tmpInfoNode->next;
|
||||
(VOID)LOS_MemFree(m_aucSysMem0, tmpInfoNode);
|
||||
tmpInfoNode = *prevHook;
|
||||
break;
|
||||
}
|
||||
prevHook = &tmpInfoNode->next;
|
||||
|
||||
@@ -918,7 +918,7 @@ STATIC UINT32 OsMemPoolAdd(VOID *pool, UINT32 size)
|
||||
return LOS_OK;
|
||||
}
|
||||
|
||||
STATIC UINT32 OsMemPoolDelete(VOID *pool)
|
||||
STATIC UINT32 OsMemPoolDelete(const VOID *pool)
|
||||
{
|
||||
UINT32 ret = LOS_NOK;
|
||||
VOID *nextPool = NULL;
|
||||
|
||||
@@ -271,7 +271,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
|
||||
{
|
||||
UINT32 intSave;
|
||||
INT32 depth;
|
||||
enum LockDepErrType checkResult = LOCKDEP_SUCCESS;
|
||||
enum LockDepErrType checkResult;
|
||||
VOID *requestAddr = (VOID *)__builtin_return_address(1);
|
||||
LosTaskCB *current = OsCurrTaskGet();
|
||||
LosTaskCB *owner = NULL;
|
||||
|
||||
@@ -208,15 +208,12 @@ UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
|
||||
PADDR_T paddr;
|
||||
STATUS_T ret;
|
||||
INT32 shareRef;
|
||||
UINT32 pmSize = 0;
|
||||
|
||||
if (sharePm != NULL) {
|
||||
*sharePm = 0;
|
||||
}
|
||||
|
||||
if (actualPm != NULL) {
|
||||
*actualPm = 0;
|
||||
}
|
||||
|
||||
ret = LOS_MuxAcquire(&space->regionMux);
|
||||
if (ret != 0) {
|
||||
return 0;
|
||||
@@ -240,22 +237,23 @@ UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
|
||||
if (sharePm != NULL) {
|
||||
*sharePm += PAGE_SIZE;
|
||||
}
|
||||
if (actualPm != NULL) {
|
||||
*actualPm += PAGE_SIZE / shareRef;
|
||||
}
|
||||
pmSize += PAGE_SIZE / shareRef;
|
||||
} else {
|
||||
if (actualPm != NULL) {
|
||||
*actualPm += PAGE_SIZE;
|
||||
}
|
||||
pmSize += PAGE_SIZE;
|
||||
}
|
||||
}
|
||||
RB_SCAN_SAFE_END(&oldVmSpace->regionRbTree, pstRbNode, pstRbNodeNext)
|
||||
|
||||
(VOID)LOS_MuxRelease(&space->regionMux);
|
||||
return *actualPm;
|
||||
|
||||
if (actualPm != NULL) {
|
||||
*actualPm = pmSize;
|
||||
}
|
||||
|
||||
return pmSize;
|
||||
}
|
||||
|
||||
LosProcessCB *OsGetPIDByAspace(LosVmSpace *space)
|
||||
LosProcessCB *OsGetPIDByAspace(const LosVmSpace *space)
|
||||
{
|
||||
UINT32 pid;
|
||||
UINT32 intSave;
|
||||
@@ -305,7 +303,7 @@ UINT32 OsCountRegionPages(LosVmSpace *space, LosVmMapRegion *region, UINT32 *pss
|
||||
}
|
||||
|
||||
if (pssPages != NULL) {
|
||||
*pssPages = (UINT32)(pss + 0.5);
|
||||
*pssPages = (UINT32)(pss + 0.5); /* 0.5, for page alignment */
|
||||
}
|
||||
|
||||
return regionPages;
|
||||
|
||||
@@ -125,10 +125,10 @@ VOID OsAddMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr)
|
||||
page->n_maps++;
|
||||
}
|
||||
|
||||
LosMapInfo *OsGetMapInfo(LosFilePage *page, LosArchMmu *archMmu, VADDR_T vaddr)
|
||||
LosMapInfo *OsGetMapInfo(const LosFilePage *page, const LosArchMmu *archMmu, VADDR_T vaddr)
|
||||
{
|
||||
LosMapInfo *info = NULL;
|
||||
LOS_DL_LIST *immap = &page->i_mmap;
|
||||
const LOS_DL_LIST *immap = &page->i_mmap;
|
||||
|
||||
LOS_DL_LIST_FOR_EACH_ENTRY(info, immap, LosMapInfo, node) {
|
||||
if ((info->archMmu == archMmu) && (info->vaddr == vaddr) && (info->page == page)) {
|
||||
@@ -214,7 +214,7 @@ VOID OsVmmFileRemove(LosVmMapRegion *region, LosArchMmu *archMmu, VM_OFFSET_T pg
|
||||
return;
|
||||
}
|
||||
|
||||
VOID OsMarkPageDirty(LosFilePage *fpage, LosVmMapRegion *region, INT32 off, INT32 len)
|
||||
VOID OsMarkPageDirty(LosFilePage *fpage, const LosVmMapRegion *region, INT32 off, INT32 len)
|
||||
{
|
||||
if (region != NULL) {
|
||||
OsSetPageDirty(fpage->vmPage);
|
||||
|
||||
@@ -233,7 +233,7 @@ LosVmSpace *OsCreateUserVmSpace(VOID)
|
||||
return space;
|
||||
}
|
||||
|
||||
STATIC BOOL OsVmSpaceParamCheck(LosVmSpace *vmSpace)
|
||||
STATIC BOOL OsVmSpaceParamCheck(const LosVmSpace *vmSpace)
|
||||
{
|
||||
if (vmSpace == NULL) {
|
||||
return FALSE;
|
||||
|
||||
@@ -297,7 +297,7 @@ int OsTryShrinkMemory(size_t nPage)
|
||||
LosFilePage *fpage = NULL;
|
||||
LosFilePage *fnext = NULL;
|
||||
|
||||
if (nPage <= 0) {
|
||||
if (nPage == 0) {
|
||||
nPage = VM_FILEMAP_MIN_SCAN;
|
||||
}
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ MMAP_DONE:
|
||||
|
||||
STATUS_T LOS_UnMMap(VADDR_T addr, size_t size)
|
||||
{
|
||||
if ((addr <= 0) || (size <= 0)) {
|
||||
if ((addr <= 0) || (size == 0)) {
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
@@ -709,7 +709,6 @@ STATIC ssize_t DoWrite(CirBufSendCB *cirBufSendCB, CHAR *buffer, size_t bufLen)
|
||||
{
|
||||
INT32 cnt;
|
||||
size_t written = 0;
|
||||
size_t toWrite = bufLen;
|
||||
UINT32 intSave;
|
||||
|
||||
#ifdef LOSCFG_SHELL_DMESG
|
||||
@@ -730,7 +729,6 @@ STATIC ssize_t DoWrite(CirBufSendCB *cirBufSendCB, CHAR *buffer, size_t bufLen)
|
||||
if (cnt <= 0) {
|
||||
break;
|
||||
}
|
||||
toWrite -= cnt;
|
||||
written += cnt;
|
||||
}
|
||||
LOS_SpinUnlockRestore(&g_consoleWriteSpinLock, intSave);
|
||||
@@ -1536,7 +1534,15 @@ STATIC ssize_t WriteToTerminal(const CONSOLE_CB *consoleCB, const CHAR *buffer,
|
||||
|
||||
fd = consoleCB->fd;
|
||||
ret = fs_getfilep(fd, &filep);
|
||||
if (ret < 0) {
|
||||
ret = -EPERM;
|
||||
goto ERROUT;
|
||||
}
|
||||
ret = GetFilepOps(filep, &privFilep, &fileOps);
|
||||
if (ret != ENOERR) {
|
||||
ret = -EINVAL;
|
||||
goto ERROUT;
|
||||
}
|
||||
|
||||
if ((fileOps == NULL) || (fileOps->write == NULL)) {
|
||||
ret = EFAULT;
|
||||
|
||||
@@ -87,7 +87,6 @@ STATIC VOID InitLevelCall(const CHAR *name, const UINT32 level, struct ModuleIni
|
||||
LOS_SpinUnlock(&g_initLock);
|
||||
if (module->hook != NULL) {
|
||||
#ifdef LOS_INIT_DEBUG
|
||||
ret = LOS_OK;
|
||||
startNsec = LOS_CurrNanosec();
|
||||
ret = (UINT32)module->hook();
|
||||
endNsec = LOS_CurrNanosec();
|
||||
|
||||
@@ -51,7 +51,7 @@ STATIC BOOL g_srandInit;
|
||||
|
||||
STATIC INT32 OsELFOpen(const CHAR *fileName, INT32 oflags)
|
||||
{
|
||||
INT32 ret = -LOS_NOK;
|
||||
INT32 ret;
|
||||
INT32 procFd;
|
||||
|
||||
procFd = AllocProcessFd();
|
||||
|
||||
@@ -124,8 +124,8 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsSetShadowValue(uintptr_t startAddr, uintpt
|
||||
uint32_t startOffset;
|
||||
uint32_t endOffset;
|
||||
|
||||
char shadowValueMask;
|
||||
char shadowValue;
|
||||
unsigned char shadowValueMask;
|
||||
unsigned char shadowValue;
|
||||
|
||||
/* endAddr - 1, then we mark [startAddr, endAddr) to value */
|
||||
LmsMem2Shadow(startAddr, &shadowStart, &startOffset);
|
||||
@@ -266,7 +266,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS void LmsPrintMemInfo(uintptr_t addr)
|
||||
}
|
||||
}
|
||||
|
||||
LMS_OUTPUT_INFO("|\t[0x%x | %2d]: ", shadowAddr, shadowOffset);
|
||||
LMS_OUTPUT_INFO("|\t[0x%x | %2u]: ", shadowAddr, shadowOffset);
|
||||
|
||||
for (int x = 0; x < printX; x += LMS_MEM_BYTES_PER_SHADOW_CELL) {
|
||||
LmsGetShadowValue(dumpAddr + x, &shadowValue);
|
||||
@@ -339,7 +339,7 @@ ATTRIBUTE_NO_SANITIZE_ADDRESS static void LmsPrintErrInfo(LmsAddrInfo *info, uin
|
||||
break;
|
||||
}
|
||||
|
||||
LMS_OUTPUT_INFO("Shadow memory address: [0x%x : %d] Shadow memory value: [%d] \n", info->shadowAddr,
|
||||
LMS_OUTPUT_INFO("Shadow memory address: [0x%x : %u] Shadow memory value: [%u] \n", info->shadowAddr,
|
||||
info->shadowOffset, info->shadowValue);
|
||||
|
||||
LMS_OUTPUT_INFO("\n");
|
||||
|
||||
@@ -289,7 +289,7 @@ STATIC UINT32 OsPerfCollectData(Event *event, PerfSampleData *data, PerfRegs *re
|
||||
* return TRUE if user haven't specified any taskId(which is supposed
|
||||
* to instrument the whole system)
|
||||
*/
|
||||
STATIC INLINE BOOL OsFilterId(UINT32 id, UINT32 *ids, UINT8 idsNr)
|
||||
STATIC INLINE BOOL OsFilterId(UINT32 id, const UINT32 *ids, UINT8 idsNr)
|
||||
{
|
||||
UINT32 i;
|
||||
if (!idsNr) {
|
||||
|
||||
@@ -300,7 +300,7 @@ UINT32 LOS_PmRegister(LOS_PmNodeType type, VOID *node)
|
||||
return LOS_EINVAL;
|
||||
}
|
||||
|
||||
STATIC UINT32 OsPmDeviceUnregister(LosPmCB *pm, LosPmDevice *device)
|
||||
STATIC UINT32 OsPmDeviceUnregister(LosPmCB *pm, const LosPmDevice *device)
|
||||
{
|
||||
LOS_SpinLock(&g_pmSpin);
|
||||
if (pm->device == device) {
|
||||
|
||||
@@ -342,7 +342,7 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
|
||||
buf_len -= (unsigned int)ret;
|
||||
|
||||
ret = snprintf_s(tmp, buf_len, (buf_len - 1), " MTU:%d %s", netif->mtu,
|
||||
netif->flags & NETIF_FLAG_UP ? "Running" : "Stop");
|
||||
(netif->flags & NETIF_FLAG_UP) ? "Running" : "Stop");
|
||||
if ((ret <= 0) || ((unsigned int)ret >= buf_len))
|
||||
goto out;
|
||||
tmp += ret;
|
||||
@@ -356,7 +356,8 @@ int print_netif(struct netif *netif, char *print_buf, unsigned int buf_len)
|
||||
buf_len -= (unsigned int)ret;
|
||||
}
|
||||
|
||||
ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n", netif->flags & NETIF_FLAG_LINK_UP ? "Link UP" : "Link Down");
|
||||
ret = snprintf_s(tmp, buf_len, (buf_len - 1), " %s\n",
|
||||
(netif->flags & NETIF_FLAG_LINK_UP) ? "Link UP" : "Link Down");
|
||||
if ((ret <= 0) || ((unsigned int)ret >= buf_len))
|
||||
goto out;
|
||||
tmp += ret;
|
||||
@@ -3019,8 +3020,8 @@ int netstat_netconn_sendq(struct netconn *conn)
|
||||
#if PF_PKT_SUPPORT
|
||||
case NETCONN_PKT_RAW:
|
||||
retVal = 0; /* always be 0 as frame send to driver directly */
|
||||
#endif
|
||||
break;
|
||||
#endif
|
||||
case NETCONN_UDP:
|
||||
retVal = netstat_udp_sendq(conn->pcb.udp);
|
||||
break;
|
||||
@@ -3797,8 +3798,9 @@ u32_t osShellIpDebug(int argc, const char **argv)
|
||||
PRINTK("%-50s ", acIPv6Addr);
|
||||
|
||||
if (snprintf_s(aclladdr, sizeof(aclladdr), sizeof(aclladdr) - 1, "%02X:%02X:%02X:%02X:%02X:%02X",
|
||||
neighbor_cache[i].lladdr[0], neighbor_cache[i].lladdr[1], neighbor_cache[i].lladdr[2],
|
||||
neighbor_cache[i].lladdr[3], neighbor_cache[i].lladdr[4], neighbor_cache[i].lladdr[5]) < 0) {
|
||||
neighbor_cache[i].lladdr[0], neighbor_cache[i].lladdr[1], /* 0, 1, member number */
|
||||
neighbor_cache[i].lladdr[2], neighbor_cache[i].lladdr[3], /* 2, 3, member number */
|
||||
neighbor_cache[i].lladdr[4], neighbor_cache[i].lladdr[5]) < 0) { /* 4, 5, member number */
|
||||
return LOS_NOK;
|
||||
}
|
||||
PRINTK("%-25s ", aclladdr);
|
||||
|
||||
@@ -116,8 +116,8 @@ static UINT16 GetFreeVid(VOID)
|
||||
for (i = 0; i < mapMaxNum; i++) {
|
||||
num = idMap->bitMap[i];
|
||||
for (j = 0; j < INT_BIT_COUNT; j++) {
|
||||
if ((num & (1 << j)) == 0) {
|
||||
num |= 1 << j;
|
||||
if ((num & (1U << j)) == 0) {
|
||||
num |= 1U << j;
|
||||
idMap->bitMap[i] = num;
|
||||
return (INT_BIT_COUNT * i + j);
|
||||
}
|
||||
@@ -160,7 +160,7 @@ static VOID ReleaseVid(UINT16 vid)
|
||||
a = vid >> INT_BIT_SHIFT;
|
||||
b = vid & (INT_BIT_COUNT - 1);
|
||||
|
||||
idMap->bitMap[a] &= ~(1 << b);
|
||||
idMap->bitMap[a] &= ~(1U << b);
|
||||
|
||||
/* shrink bit map */
|
||||
if (mapMaxNum > 1) {
|
||||
|
||||
@@ -34,9 +34,9 @@
|
||||
#include "los_typedef.h"
|
||||
#include "los_process_pri.h"
|
||||
|
||||
#define INT_BIT_COUNT 32
|
||||
#define INT_BIT_SHIFT 5
|
||||
#define VID_MAP_MAX_NUM 32
|
||||
#define INT_BIT_COUNT 32U
|
||||
#define INT_BIT_SHIFT 5U
|
||||
#define VID_MAP_MAX_NUM 32U
|
||||
|
||||
#define MAX_INVALID_TIMER_VID (VID_MAP_MAX_NUM * INT_BIT_COUNT)
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ INT32 CmdLog(INT32 argc, const CHAR **argv)
|
||||
}
|
||||
} else if (!strncmp(argv[0], "module", strlen(argv[0]) + 1)) {
|
||||
module = strtoul(argv[1], &p, 0);
|
||||
if ((*p != 0) || (module > MODULE4) || (module < MODULE0)) {
|
||||
if ((*p != 0) || (module > MODULE4)) {
|
||||
PRINTK("log %s can't access %s\n", argv[0], argv[1]);
|
||||
PRINTK("not support yet\n");
|
||||
return -1;
|
||||
|
||||
@@ -329,7 +329,7 @@ END:
|
||||
LITE_OS_SEC_TEXT_MINOR UINT32 ShellEntry(UINTPTR param)
|
||||
{
|
||||
CHAR ch;
|
||||
INT32 n = 0;
|
||||
INT32 n;
|
||||
ShellCB *shellCB = (ShellCB *)param;
|
||||
|
||||
CONSOLE_CB *consoleCB = OsGetConsoleByID((INT32)shellCB->consoleID);
|
||||
|
||||
@@ -425,7 +425,7 @@ STATIC VOID OsBufFullWrite(const CHAR *dst, UINT32 logLen)
|
||||
|
||||
STATIC VOID OsWriteTailToHead(const CHAR *dst, UINT32 logLen)
|
||||
{
|
||||
UINT32 writeLen = 0;
|
||||
UINT32 writeLen;
|
||||
UINT32 bufSize = g_logBufSize;
|
||||
UINT32 logSize = g_dmesgInfo->logSize;
|
||||
UINT32 tail = g_dmesgInfo->logTail;
|
||||
|
||||
@@ -83,6 +83,10 @@ int GetFullpath(int fd, const char *path, char **fullpath)
|
||||
fd = GetAssociatedSystemFd(fd);
|
||||
}
|
||||
ret = fs_getfilep(fd, &file);
|
||||
if (ret < 0) {
|
||||
ret = -EPERM;
|
||||
goto OUT;
|
||||
}
|
||||
if (file) {
|
||||
ret = stat(file->f_path, &bufRet);
|
||||
if (!ret) {
|
||||
|
||||
@@ -49,13 +49,13 @@ static VOID NestingPrioHigh(INT32 irq, VOID *data)
|
||||
UINT64 curTime;
|
||||
curTime = LOS_CurrNanosec();
|
||||
g_recordTime[g_saveIndex] = curTime - g_intPendTime;
|
||||
if (g_saveIndex == MAX_RECORD_SIZE) {
|
||||
g_saveIndex = 0;
|
||||
}
|
||||
dprintf("curTime = %lld, pendTime = %lld \n", curTime, g_intPendTime);
|
||||
dprintf("%lld\n", curTime - g_intPendTime);
|
||||
dprintf("[swtmr] hwi response time : ##%lld \n", g_recordTime[g_saveIndex]);
|
||||
g_saveIndex++;
|
||||
if (g_saveIndex == MAX_RECORD_SIZE) {
|
||||
g_saveIndex = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static VOID DumpResult()
|
||||
|
||||
@@ -39,8 +39,9 @@ extern "C" {
|
||||
|
||||
static UINT32 TaskF02(VOID)
|
||||
{
|
||||
UINT32 ret, cpupUse;
|
||||
UINT32 ret = OS_ERROR, cpupUse;
|
||||
g_cpupTestCount++;
|
||||
|
||||
// 2, Here, assert that g_cpupTestCount is equal to the expected value.
|
||||
ICUNIT_GOTO_EQUAL(g_cpupTestCount, 2, g_cpupTestCount, EXIT);
|
||||
cpupUse = LOS_HistoryProcessCpuUsage(g_testTaskID01, CPUP_ALL_TIME);
|
||||
|
||||
@@ -39,9 +39,10 @@ extern "C" {
|
||||
|
||||
static UINT32 TaskF01(VOID)
|
||||
{
|
||||
UINT32 ret;
|
||||
UINT32 ret = OS_ERROR;
|
||||
UINT32 cpupUse;
|
||||
g_cpupTestCount++;
|
||||
|
||||
ICUNIT_GOTO_EQUAL(g_cpupTestCount, 1, g_cpupTestCount, EXIT);
|
||||
|
||||
cpupUse = LOS_HistoryProcessCpuUsage(LOS_GetCurrProcessID(), CPU_USE_MODE0);
|
||||
|
||||
@@ -76,7 +76,7 @@ static void Task01(void)
|
||||
ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT2);
|
||||
|
||||
ret = memset_s((void *)(&taskInitParam), sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
|
||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT2;
|
||||
ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT2);
|
||||
taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)Task04;
|
||||
taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
|
||||
taskInitParam.pcName = "SmpCpup005_task04";
|
||||
|
||||
@@ -33,12 +33,12 @@
|
||||
static int TestCase(void)
|
||||
{
|
||||
int ret;
|
||||
int *test = NULL;
|
||||
int status = 0;
|
||||
int *test = NULL; // for trggering an exception
|
||||
pid_t pid = fork();
|
||||
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
|
||||
if (pid == 0) {
|
||||
*test = 0x1;
|
||||
*test = 0x1; // Deliberately trigger an exceptioin
|
||||
exit(0);
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ static int TestCase(void)
|
||||
pid = fork();
|
||||
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
|
||||
if (pid == 0) {
|
||||
*test = 0x1;
|
||||
*test = 0x1; // Deliberately trigger an exceptioin
|
||||
exit(0);
|
||||
}
|
||||
|
||||
|
||||
@@ -35,18 +35,17 @@
|
||||
|
||||
static int TestThread(void)
|
||||
{
|
||||
int *test = nullptr;
|
||||
int ret;
|
||||
int *test = nullptr; // For triggering an exceptioin
|
||||
|
||||
pid_t pid = fork();
|
||||
ICUNIT_ASSERT_WITHIN_EQUAL(pid, 0, INVALID_PROCESS_ID, pid);
|
||||
if (pid == 0) {
|
||||
*test = 0x1;
|
||||
*test = 0x1; // Deliberately trigger an exceptioin
|
||||
while (1) {
|
||||
}
|
||||
}
|
||||
|
||||
*test = 0x1;
|
||||
*test = 0x1; // Deliberately trigger an exceptioin
|
||||
|
||||
ret = waitpid(pid, NULL, 0);
|
||||
ICUNIT_ASSERT_EQUAL(ret, pid, ret);
|
||||
@@ -56,7 +55,6 @@ static int TestThread(void)
|
||||
|
||||
static int TestCase(void)
|
||||
{
|
||||
int *test = nullptr;
|
||||
int count = 5;
|
||||
int status = 0;
|
||||
int ret;
|
||||
|
||||
@@ -37,6 +37,12 @@ static int Testcase(VOID)
|
||||
int shmid[SHMID_MAX + 1] = {-1};
|
||||
int ret;
|
||||
int i;
|
||||
struct shm_info shmInfo;
|
||||
int leftShmIds;
|
||||
|
||||
ret = shmctl(0, SHM_INFO, reinterpret_cast<struct shmid_ds *>(&shmInfo));
|
||||
ICUNIT_ASSERT_EQUAL(ret, SHMID_MAX, ret);
|
||||
leftShmIds = SHMID_MAX - shmInfo.used_ids;
|
||||
|
||||
shmid[0] = shmget((key_t)0x1234, PAGE_SIZE, 0777 | IPC_CREAT);
|
||||
ICUNIT_ASSERT_NOT_EQUAL(shmid[0], -1, shmid[0]);
|
||||
@@ -50,20 +56,20 @@ static int Testcase(VOID)
|
||||
ret = shmctl(shmid[0], IPC_RMID, NULL);
|
||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||
|
||||
for (i = 0; i < SHMID_MAX; i++) {
|
||||
for (i = 0; i < leftShmIds; i++) {
|
||||
shmid[i] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT);
|
||||
ICUNIT_ASSERT_NOT_EQUAL(shmid[i], -1, shmid[i]);
|
||||
}
|
||||
|
||||
shmid[SHMID_MAX] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT);
|
||||
ICUNIT_ASSERT_EQUAL(shmid[SHMID_MAX], -1, shmid[SHMID_MAX]);
|
||||
shmid[leftShmIds] = shmget(IPC_PRIVATE, PAGE_SIZE, 0777 | IPC_CREAT);
|
||||
ICUNIT_ASSERT_EQUAL(shmid[leftShmIds], -1, shmid[leftShmIds]);
|
||||
|
||||
for (i = 0; i < SHMID_MAX; i++) {
|
||||
for (i = 0; i < leftShmIds; i++) {
|
||||
ret = shmctl(shmid[i], IPC_RMID, NULL);
|
||||
ICUNIT_ASSERT_EQUAL(ret, 0, ret);
|
||||
}
|
||||
|
||||
for (i = 0; i < SHMID_MAX; i++) {
|
||||
for (i = 0; i < leftShmIds; i++) {
|
||||
ret = shmctl(shmid[i], IPC_RMID, NULL);
|
||||
ICUNIT_ASSERT_EQUAL(ret, -1, ret);
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ static int TestMkfifo()
|
||||
if (fd < 0) {
|
||||
return -1;
|
||||
}
|
||||
write(fd, sentence, sizeof(sentence) + 1);
|
||||
write(fd, sentence, sizeof(sentence));
|
||||
close(fd);
|
||||
exit(0);
|
||||
} else {
|
||||
|
||||
@@ -45,7 +45,6 @@ static int TestMkfifoReturn()
|
||||
int retValue, i;
|
||||
int status = 0;
|
||||
pid_t pid;
|
||||
char pathname[NAME_BUF_SIZE];
|
||||
|
||||
retValue = mkfifo("/dev/fifo0", 0777); // 0777, mkfifo config.
|
||||
ICUNIT_ASSERT_EQUAL(retValue, 0, retValue);
|
||||
@@ -57,7 +56,6 @@ static int TestMkfifoReturn()
|
||||
unlink("/dev/fifo0/fifo1");
|
||||
unlink("/dev/usr/fifo0");
|
||||
rmdir("/dev/usr");
|
||||
unlink(pathname);
|
||||
unlink("/dev/fifo0");
|
||||
return LOS_OK;
|
||||
|
||||
@@ -66,7 +64,6 @@ EXIT:
|
||||
unlink("/dev/fifo0/fifo1");
|
||||
unlink("/dev/usr/fifo0");
|
||||
rmdir("/dev/usr");
|
||||
unlink(pathname);
|
||||
unlink("/dev/fifo0");
|
||||
return LOS_NOK;
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ static UINT32 testcase(VOID)
|
||||
UINT32 ret;
|
||||
|
||||
retval = pipe(pipeFd);
|
||||
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
|
||||
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT4);
|
||||
|
||||
/* Watch fd to see when it has input. */
|
||||
FD_ZERO(&rfds);
|
||||
@@ -62,11 +62,11 @@ static UINT32 testcase(VOID)
|
||||
|
||||
/* Wait up to three seconds. */
|
||||
epFd = epoll_create1(100); /* 100, cretae input, */
|
||||
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
|
||||
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT2);
|
||||
|
||||
ev.events = EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM;
|
||||
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
|
||||
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
|
||||
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT1);
|
||||
|
||||
pid = fork();
|
||||
if (pid == 0) {
|
||||
@@ -86,7 +86,7 @@ static UINT32 testcase(VOID)
|
||||
sleep(1);
|
||||
close(pipeFd[0]);
|
||||
retval = write(pipeFd[1], "0123456789012345678901234567890123456789", 40); /* write 40 bytes to stdin(fd 0) */
|
||||
ICUNIT_GOTO_EQUAL(retval, 40, retval, OUT);
|
||||
ICUNIT_GOTO_EQUAL(retval, 40, retval, OUT3);
|
||||
close(pipeFd[1]);
|
||||
|
||||
wait(&status);
|
||||
@@ -95,10 +95,20 @@ static UINT32 testcase(VOID)
|
||||
}
|
||||
|
||||
return LOS_OK;
|
||||
OUT:
|
||||
OUT1:
|
||||
close(epFd);
|
||||
close(pipeFd[0]);
|
||||
close(pipeFd[1]);
|
||||
return LOS_NOK;
|
||||
OUT2:
|
||||
close(pipeFd[0]);
|
||||
close(pipeFd[1]);
|
||||
return LOS_NOK;
|
||||
OUT3:
|
||||
close(epFd);
|
||||
close(pipeFd[1]);
|
||||
return LOS_NOK;
|
||||
OUT4:
|
||||
return LOS_NOK;
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ static UINT32 testcase(VOID)
|
||||
int i = 0;
|
||||
int status;
|
||||
|
||||
int epFd;
|
||||
int epFd = 0;
|
||||
sigset_t mask;
|
||||
void (*retSig)(int);
|
||||
struct epoll_event ev;
|
||||
@@ -75,7 +75,7 @@ static UINT32 testcase(VOID)
|
||||
ICUNIT_ASSERT_EQUAL(retval, 0, retval);
|
||||
|
||||
retval = pipe(pipeFd);
|
||||
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT);
|
||||
ICUNIT_GOTO_EQUAL(retval, 0, retval, OUT3);
|
||||
|
||||
/* Watch fd to see when it has input. */
|
||||
FD_ZERO(&rfds);
|
||||
@@ -86,12 +86,12 @@ static UINT32 testcase(VOID)
|
||||
tv.tv_nsec = 5; /* 5, wait timer, nano second */
|
||||
|
||||
epFd = epoll_create1(100); /* 100, cretae input, */
|
||||
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT);
|
||||
ICUNIT_GOTO_NOT_EQUAL(epFd, -1, epFd, OUT2);
|
||||
|
||||
ev.events = EPOLLRDNORM;
|
||||
retval = epoll_ctl(epFd, EPOLL_CTL_ADD, pipeFd[0], &ev);
|
||||
|
||||
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT);
|
||||
ICUNIT_GOTO_NOT_EQUAL(retval, -1, retval, OUT1);
|
||||
|
||||
pid = fork();
|
||||
if (pid == 0) {
|
||||
@@ -125,10 +125,12 @@ static UINT32 testcase(VOID)
|
||||
}
|
||||
|
||||
return LOS_OK;
|
||||
OUT:
|
||||
OUT1:
|
||||
close(epFd);
|
||||
OUT2:
|
||||
close(pipeFd[0]);
|
||||
close(pipeFd[1]);
|
||||
close(epFd);
|
||||
OUT3:
|
||||
return LOS_NOK;
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ static int GetHostByAddrTest(void)
|
||||
addr = gethostbyaddr(&ia, sizeof ia, AF_INET);
|
||||
ICUNIT_ASSERT_EQUAL(errno, EINVAL, errno);
|
||||
|
||||
RecoveryFileEnv(pathList, file_number);
|
||||
RecoveryFileEnv(pathList, file_number);
|
||||
return ICUNIT_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ static int Testcase()
|
||||
#define CURRENT_PROCESS_POLICY SCHED_RR
|
||||
|
||||
struct sched_param param = { 0 };
|
||||
int ret;
|
||||
int ret = OS_ERROR;
|
||||
|
||||
int currProcessPri = getpriority(PRIO_PROCESS, getpid());
|
||||
ICUNIT_GOTO_WITHIN_EQUAL(currProcessPri, 0, 31, currProcessPri, ERROR_OUT); // 31, assert function Result equal to this.
|
||||
|
||||
@@ -35,7 +35,7 @@ static int TestCase()
|
||||
{
|
||||
#define PROCESS_TEST_PRI1 (currProcessPri + 1)
|
||||
struct sched_param param = { 0 };
|
||||
int ret;
|
||||
int ret = OS_ERROR;
|
||||
int val, currPolicy;
|
||||
int currProcessPri = getpriority(PRIO_PROCESS, getpid());
|
||||
ICUNIT_GOTO_WITHIN_EQUAL(currProcessPri, 0, 31, currProcessPri, ERROR_OUT); // 31, assert currProcessPri equal to this.
|
||||
|
||||
Reference in New Issue
Block a user