Merge pull request #4740 from Guozhanxin/scheduler_check

4 files changed, 21 insertions, 11 deletions

diff --git a/components/dfs/filesystems/devfs/devfs.c b/components/dfs/filesystems/devfs/devfs.c
index d60f7ddc9b..8e58fb9f53 100644
--- a/components/dfs/filesystems/devfs/devfs.c
+++ b/components/dfs/filesystems/devfs/devfs.c
@@ -144,11 +144,15 @@ int dfs_device_fs_open(struct dfs_fd *file)
         {
             count ++;
         }
+        rt_exit_critical();
 
         root_dirent = (struct device_dirent *)rt_malloc(sizeof(struct device_dirent) +
                       count * sizeof(rt_device_t));
         if (root_dirent != RT_NULL)
         {
+            /* lock scheduler */
+            rt_enter_critical();
+
             root_dirent->devices = (rt_device_t *)(root_dirent + 1);
             root_dirent->read_index = 0;
             root_dirent->device_count = count;
@@ -156,12 +160,18 @@ int dfs_device_fs_open(struct dfs_fd *file)
             /* get all device node */
             for (node = information->object_list.next; node != &(information->object_list); node = node->next)
             {
+                /* avoid memory write through */
+                if (count == root_dirent->device_count)
+                {
+                    rt_kprintf("warning: There are newly added devices that are not displayed!");
+                    break;
+                }
                 object = rt_list_entry(node, struct rt_object, list);
                 root_dirent->devices[count] = (rt_device_t)object;
                 count ++;
             }
+            rt_exit_critical();
         }
-        rt_exit_critical();
 
         /* set data */
         file->data = root_dirent;
diff --git a/components/drivers/ipc/completion.c b/components/drivers/ipc/completion.c
index f13718f9b3..84dfb740b1 100644
--- a/components/drivers/ipc/completion.c
+++ b/components/drivers/ipc/completion.c
@@ -57,6 +57,9 @@ rt_err_t rt_completion_wait(struct rt_completion *completion,
     rt_thread_t thread;
     RT_ASSERT(completion != RT_NULL);
 
+    /* current context checking */
+    RT_DEBUG_SCHEDULER_AVAILABLE(timeout != 0);
+
     result = RT_EOK;
     thread = rt_thread_self();
 
@@ -82,9 +85,6 @@ rt_err_t rt_completion_wait(struct rt_completion *completion,
             rt_list_insert_before(&(completion->suspended_list),
                                   &(thread->tlist));
 
-            /* current context checking */
-            RT_DEBUG_NOT_IN_INTERRUPT;
-
             /* start timer */
             if (timeout > 0)
             {
diff --git a/components/drivers/ipc/dataqueue.c b/components/drivers/ipc/dataqueue.c
index 4e52662c44..94e7b087c5 100644
--- a/components/drivers/ipc/dataqueue.c
+++ b/components/drivers/ipc/dataqueue.c
@@ -98,6 +98,9 @@ rt_err_t rt_data_queue_push(struct rt_data_queue *queue,
     RT_ASSERT(queue != RT_NULL);
     RT_ASSERT(queue->magic == DATAQUEUE_MAGIC);
 
+    /* current context checking */
+    RT_DEBUG_SCHEDULER_AVAILABLE(timeout != 0);
+
     result = RT_EOK;
     thread = rt_thread_self();
 
@@ -112,9 +115,6 @@ rt_err_t rt_data_queue_push(struct rt_data_queue *queue,
             goto __exit;
         }
 
-        /* current context checking */
-        RT_DEBUG_NOT_IN_INTERRUPT;
-
         /* reset thread error number */
         thread->error = RT_EOK;
 
@@ -217,6 +217,9 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
     RT_ASSERT(data_ptr != RT_NULL);
     RT_ASSERT(size != RT_NULL);
 
+    /* current context checking */
+    RT_DEBUG_SCHEDULER_AVAILABLE(timeout != 0);
+
     result = RT_EOK;
     thread = rt_thread_self();
 
@@ -230,9 +233,6 @@ rt_err_t rt_data_queue_pop(struct rt_data_queue *queue,
             goto __exit;
         }
 
-        /* current context checking */
-        RT_DEBUG_NOT_IN_INTERRUPT;
-
         /* reset thread error number */
         thread->error = RT_EOK;
 
diff --git a/components/drivers/ipc/waitqueue.c b/components/drivers/ipc/waitqueue.c
index 6a26604617..7847c6dde2 100644
--- a/components/drivers/ipc/waitqueue.c
+++ b/components/drivers/ipc/waitqueue.c
@@ -129,7 +129,7 @@ int rt_wqueue_wait(rt_wqueue_t *queue, int condition, int msec)
     rt_base_t level;
 
     /* current context checking */
-    RT_DEBUG_NOT_IN_INTERRUPT;
+    RT_DEBUG_SCHEDULER_AVAILABLE(RT_TRUE);
 
     tick = rt_tick_from_millisecond(msec);