!1045 Fix : pthread_cond_timedwait 信号丢失问题修复挑单到3.1-Release 分支

Merge pull request !1045 from yinjiaming/cherry-pick-1680507618
fixed 2374c01 from https://gitee.com/hgbveiu743/kernel_liteos_m/pulls/1043
2023-04-11 01:58:35 +00:00 · 2023-04-03 07:40:22 +00:00 · 2023-01-31 11:28:55 +00:00 · 2023-01-31 10:46:40 +08:00
2 changed files with 5 additions and 1 deletions
--- a/components/fs/vfs/vfs_config.h
+++ b/components/fs/vfs/vfs_config.h
@@ -138,4 +138,9 @@

 #define MAX_DIRENT_NUM 14 // 14 means 4096 length buffer can store 14 dirent, see struct DIR

+/* max number of open directories */
+#ifndef LOSCFG_MAX_OPEN_DIRS
+#define LOSCFG_MAX_OPEN_DIRS 10
+#endif
+
 #endif
--- a/kal/posix/src/pthread_cond.c
+++ b/kal/posix/src/pthread_cond.c
@@ -309,7 +309,6 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
        PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__);
    }

-    (VOID)LOS_EventClear(&(cond->event), 0);
    ret = (INT32)LOS_EventRead(&(cond->event), 0x0f, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, (UINT32)absTicks);

    if (pthread_mutex_lock(mutex) != 0) {
Author	SHA1	Message	Date
openharmony_ci	d4d56b2b7c	!1045 Fix : pthread_cond_timedwait 信号丢失问题修复挑单到3.1-Release 分支 Merge pull request !1045 from yinjiaming/cherry-pick-1680507618	2023-04-11 01:58:35 +00:00
yinjiaming	01dae72fe5	fixed `2374c01` from https://gitee.com/hgbveiu743/kernel_liteos_m/pulls/1043 fix:pthread_cond_timedwait解锁后清理的问题该函数解锁mutex 后先清理事件，导致等的事件丢失 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: I36f8658b1b850734bc029b486fec103f6bd10588	2023-04-03 07:40:22 +00:00
openharmony_ci	93e8dee1ae	!1018 fix：添加MAX_OPEN_DIRS宏，标识最大可打开dir数量 Merge pull request !1018 from zhangdengyu/max_open_dir	2023-01-31 11:28:55 +00:00
zhangdengyu	0988dcde34	fix: 添加LOSCFG_MAX_OPEN_DIRS标识最大可打开dir数量方案描述：提供LOSCFG_MAX_OPEN_DIRS宏定义，标识最大可打开dir数量。 BREAKING CHANGE: 新增LOSCFG_MAX_OPEN_DIRS宏定义，标识最大可打开dir数量。 Close：#I6BVYZ Signed-off-by: zhangdengyu <zhangdengyu2@huawei.com>	2023-01-31 10:46:40 +08:00