|  | @@ -20,139 +20,139 @@ static char msg_pool[2048];
 | 
	
		
			
				|  |  |  /* 线程1入口函数 */
 | 
	
		
			
				|  |  |  static void thread1_entry(void* parameter)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	char buf[128];
 | 
	
		
			
				|  |  | +    char buf[128];
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	while (1)
 | 
	
		
			
				|  |  | -	{
 | 
	
		
			
				|  |  | -		rt_memset(&buf[0], 0, sizeof(buf));
 | 
	
		
			
				|  |  | +    while (1)
 | 
	
		
			
				|  |  | +    {
 | 
	
		
			
				|  |  | +        rt_memset(&buf[0], 0, sizeof(buf));
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		/* 从消息队列中接收消息 */
 | 
	
		
			
				|  |  | -		if (rt_mq_recv(&mq, &buf[0], sizeof(buf), RT_WAITING_FOREVER) == RT_EOK)
 | 
	
		
			
				|  |  | -		{
 | 
	
		
			
				|  |  | -			rt_kprintf("thread1: recv msg from message queue, the content:%s\n", buf);
 | 
	
		
			
				|  |  | -		}
 | 
	
		
			
				|  |  | +        /* 从消息队列中接收消息 */
 | 
	
		
			
				|  |  | +        if (rt_mq_recv(&mq, &buf[0], sizeof(buf), RT_WAITING_FOREVER) == RT_EOK)
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +            rt_kprintf("thread1: recv msg from message queue, the content:%s\n", buf);
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		/* 延迟10个OS Tick */
 | 
	
		
			
				|  |  | -		rt_thread_delay(10);
 | 
	
		
			
				|  |  | -	}
 | 
	
		
			
				|  |  | +        /* 延迟10个OS Tick */
 | 
	
		
			
				|  |  | +        rt_thread_delay(10);
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /* 线程2入口函数 */
 | 
	
		
			
				|  |  |  static void thread2_entry(void* parameter)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	int i, result;
 | 
	
		
			
				|  |  | -	char buf[] = "this is message No.x";
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -	while (1)
 | 
	
		
			
				|  |  | -	{
 | 
	
		
			
				|  |  | -		for (i = 0; i < 10; i++)
 | 
	
		
			
				|  |  | -		{
 | 
	
		
			
				|  |  | -			buf[sizeof(buf) - 2] = '0' + i;
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -			rt_kprintf("thread2: send message - %s\n", buf);
 | 
	
		
			
				|  |  | -			/* 发送消息到消息队列中 */
 | 
	
		
			
				|  |  | -			result = rt_mq_send(&mq, &buf[0], sizeof(buf));
 | 
	
		
			
				|  |  | -			if ( result == -RT_EFULL)
 | 
	
		
			
				|  |  | -			{
 | 
	
		
			
				|  |  | -				/* 消息队列满, 延迟1s时间 */
 | 
	
		
			
				|  |  | -				rt_kprintf("message queue full, delay 1s\n");
 | 
	
		
			
				|  |  | -				rt_thread_delay(100);
 | 
	
		
			
				|  |  | -			}
 | 
	
		
			
				|  |  | -		}
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -		/* 延时10个OS Tick */
 | 
	
		
			
				|  |  | -		rt_thread_delay(10);
 | 
	
		
			
				|  |  | -	}
 | 
	
		
			
				|  |  | +    int i, result;
 | 
	
		
			
				|  |  | +    char buf[] = "this is message No.x";
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    while (1)
 | 
	
		
			
				|  |  | +    {
 | 
	
		
			
				|  |  | +        for (i = 0; i < 10; i++)
 | 
	
		
			
				|  |  | +        {
 | 
	
		
			
				|  |  | +            buf[sizeof(buf) - 2] = '0' + i;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +            rt_kprintf("thread2: send message - %s\n", buf);
 | 
	
		
			
				|  |  | +            /* 发送消息到消息队列中 */
 | 
	
		
			
				|  |  | +            result = rt_mq_send(&mq, &buf[0], sizeof(buf));
 | 
	
		
			
				|  |  | +            if ( result == -RT_EFULL)
 | 
	
		
			
				|  |  | +            {
 | 
	
		
			
				|  |  | +                /* 消息队列满, 延迟1s时间 */
 | 
	
		
			
				|  |  | +                rt_kprintf("message queue full, delay 1s\n");
 | 
	
		
			
				|  |  | +                rt_thread_delay(100);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +        }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +        /* 延时10个OS Tick */
 | 
	
		
			
				|  |  | +        rt_thread_delay(10);
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  /* 线程3入口函数 */
 | 
	
		
			
				|  |  |  static void thread3_entry(void* parameter)
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	char buf[] = "this is an urgent message!";
 | 
	
		
			
				|  |  | +    char buf[] = "this is an urgent message!";
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	while (1)
 | 
	
		
			
				|  |  | -	{
 | 
	
		
			
				|  |  | -		rt_kprintf("thread3: send an urgent message\n");
 | 
	
		
			
				|  |  | +    while (1)
 | 
	
		
			
				|  |  | +    {
 | 
	
		
			
				|  |  | +        rt_kprintf("thread3: send an urgent message\n");
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		/* 发送紧急消息到消息队列中 */
 | 
	
		
			
				|  |  | -		rt_mq_urgent(&mq, &buf[0], sizeof(buf));
 | 
	
		
			
				|  |  | +        /* 发送紧急消息到消息队列中 */
 | 
	
		
			
				|  |  | +        rt_mq_urgent(&mq, &buf[0], sizeof(buf));
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -		/* 延时25个OS Tick */
 | 
	
		
			
				|  |  | -		rt_thread_delay(25);
 | 
	
		
			
				|  |  | -	}
 | 
	
		
			
				|  |  | +        /* 延时25个OS Tick */
 | 
	
		
			
				|  |  | +        rt_thread_delay(25);
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  int messageq_simple_init()
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	/* 初始化消息队列 */
 | 
	
		
			
				|  |  | -	rt_mq_init(&mq, "mqt", 
 | 
	
		
			
				|  |  | -		&msg_pool[0], /* 内存池指向msg_pool */ 
 | 
	
		
			
				|  |  | -		128 - sizeof(void*), /* 每个消息的大小是 128 - void* */
 | 
	
		
			
				|  |  | -		sizeof(msg_pool), /* 内存池的大小是msg_pool的大小 */
 | 
	
		
			
				|  |  | -		RT_IPC_FLAG_FIFO); /* 如果有多个线程等待,按照先来先得到的方法分配消息 */
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -	/* 创建线程1 */
 | 
	
		
			
				|  |  | -	tid1 = rt_thread_create("t1",
 | 
	
		
			
				|  |  | -		thread1_entry, RT_NULL, /* 线程入口是thread1_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | -		THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | -	if (tid1 != RT_NULL)
 | 
	
		
			
				|  |  | -		rt_thread_startup(tid1);
 | 
	
		
			
				|  |  | -	else
 | 
	
		
			
				|  |  | -		tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -	/* 创建线程2 */
 | 
	
		
			
				|  |  | -	tid2 = rt_thread_create("t2",
 | 
	
		
			
				|  |  | -		thread2_entry, RT_NULL, /* 线程入口是thread2_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | -		THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | -	if (tid2 != RT_NULL)
 | 
	
		
			
				|  |  | -		rt_thread_startup(tid2);
 | 
	
		
			
				|  |  | -	else
 | 
	
		
			
				|  |  | -		tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -	/* 创建线程3 */
 | 
	
		
			
				|  |  | -	tid3 = rt_thread_create("t3",
 | 
	
		
			
				|  |  | -		thread3_entry, RT_NULL, /* 线程入口是thread2_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | -		THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | -	if (tid3 != RT_NULL)
 | 
	
		
			
				|  |  | -		rt_thread_startup(tid3);
 | 
	
		
			
				|  |  | -	else
 | 
	
		
			
				|  |  | -		tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | -	return 0;
 | 
	
		
			
				|  |  | +    /* 初始化消息队列 */
 | 
	
		
			
				|  |  | +    rt_mq_init(&mq, "mqt",
 | 
	
		
			
				|  |  | +               &msg_pool[0],        /* 内存池指向msg_pool */
 | 
	
		
			
				|  |  | +               128 - sizeof(void*), /* 每个消息的大小是 128 - void* */
 | 
	
		
			
				|  |  | +               sizeof(msg_pool),    /* 内存池的大小是msg_pool的大小 */
 | 
	
		
			
				|  |  | +               RT_IPC_FLAG_FIFO);   /* 如果有多个线程等待,按照先来先得到的方法分配消息 */
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /* 创建线程1 */
 | 
	
		
			
				|  |  | +    tid1 = rt_thread_create("t1",
 | 
	
		
			
				|  |  | +                            thread1_entry, RT_NULL, /* 线程入口是thread1_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | +                            THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | +    if (tid1 != RT_NULL)
 | 
	
		
			
				|  |  | +        rt_thread_startup(tid1);
 | 
	
		
			
				|  |  | +    else
 | 
	
		
			
				|  |  | +        tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /* 创建线程2 */
 | 
	
		
			
				|  |  | +    tid2 = rt_thread_create("t2",
 | 
	
		
			
				|  |  | +                            thread2_entry, RT_NULL, /* 线程入口是thread2_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | +                            THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | +    if (tid2 != RT_NULL)
 | 
	
		
			
				|  |  | +        rt_thread_startup(tid2);
 | 
	
		
			
				|  |  | +    else
 | 
	
		
			
				|  |  | +        tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    /* 创建线程3 */
 | 
	
		
			
				|  |  | +    tid3 = rt_thread_create("t3",
 | 
	
		
			
				|  |  | +                            thread3_entry, RT_NULL, /* 线程入口是thread2_entry, 入口参数是RT_NULL */
 | 
	
		
			
				|  |  | +                            THREAD_STACK_SIZE, THREAD_PRIORITY, THREAD_TIMESLICE);
 | 
	
		
			
				|  |  | +    if (tid3 != RT_NULL)
 | 
	
		
			
				|  |  | +        rt_thread_startup(tid3);
 | 
	
		
			
				|  |  | +    else
 | 
	
		
			
				|  |  | +        tc_stat(TC_STAT_END | TC_STAT_FAILED);
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +    return 0;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  #ifdef RT_USING_TC
 | 
	
		
			
				|  |  |  static void _tc_cleanup()
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	/* 调度器上锁,上锁后,将不再切换到其他线程,仅响应中断 */
 | 
	
		
			
				|  |  | -	rt_enter_critical();
 | 
	
		
			
				|  |  | +    /* 调度器上锁,上锁后,将不再切换到其他线程,仅响应中断 */
 | 
	
		
			
				|  |  | +    rt_enter_critical();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	/* 删除线程 */
 | 
	
		
			
				|  |  | -	if (tid1 != RT_NULL && tid1->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | -		rt_thread_delete(tid1);
 | 
	
		
			
				|  |  | -	if (tid2 != RT_NULL && tid2->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | -		rt_thread_delete(tid2);
 | 
	
		
			
				|  |  | -	if (tid3 != RT_NULL && tid3->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | -		rt_thread_delete(tid3);
 | 
	
		
			
				|  |  | +    /* 删除线程 */
 | 
	
		
			
				|  |  | +    if (tid1 != RT_NULL && tid1->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | +        rt_thread_delete(tid1);
 | 
	
		
			
				|  |  | +    if (tid2 != RT_NULL && tid2->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | +        rt_thread_delete(tid2);
 | 
	
		
			
				|  |  | +    if (tid3 != RT_NULL && tid3->stat != RT_THREAD_CLOSE)
 | 
	
		
			
				|  |  | +        rt_thread_delete(tid3);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	/* 执行消息队列对象脱离 */
 | 
	
		
			
				|  |  | -	rt_mq_detach(&mq);
 | 
	
		
			
				|  |  | +    /* 执行消息队列对象脱离 */
 | 
	
		
			
				|  |  | +    rt_mq_detach(&mq);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	/* 调度器解锁 */
 | 
	
		
			
				|  |  | -	rt_exit_critical();
 | 
	
		
			
				|  |  | +    /* 调度器解锁 */
 | 
	
		
			
				|  |  | +    rt_exit_critical();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	/* 设置TestCase状态 */
 | 
	
		
			
				|  |  | -	tc_done(TC_STAT_PASSED);
 | 
	
		
			
				|  |  | +    /* 设置TestCase状态 */
 | 
	
		
			
				|  |  | +    tc_done(TC_STAT_PASSED);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  int _tc_messageq_simple()
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	/* 设置TestCase清理回调函数 */
 | 
	
		
			
				|  |  | -	tc_cleanup(_tc_cleanup);
 | 
	
		
			
				|  |  | -	messageq_simple_init();
 | 
	
		
			
				|  |  | +    /* 设置TestCase清理回调函数 */
 | 
	
		
			
				|  |  | +    tc_cleanup(_tc_cleanup);
 | 
	
		
			
				|  |  | +    messageq_simple_init();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	/* 返回TestCase运行的最长时间 */
 | 
	
		
			
				|  |  | -	return 100;
 | 
	
		
			
				|  |  | +    /* 返回TestCase运行的最长时间 */
 | 
	
		
			
				|  |  | +    return 100;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  /* 输出函数命令到finsh shell中 */
 | 
	
		
			
				|  |  |  FINSH_FUNCTION_EXPORT(_tc_messageq_simple, a simple message queue example);
 | 
	
	
		
			
				|  | @@ -160,8 +160,8 @@ FINSH_FUNCTION_EXPORT(_tc_messageq_simple, a simple message queue example);
 | 
	
		
			
				|  |  |  /* 用户应用入口 */
 | 
	
		
			
				|  |  |  int rt_application_init()
 | 
	
		
			
				|  |  |  {
 | 
	
		
			
				|  |  | -	messageq_simple_init();
 | 
	
		
			
				|  |  | +    messageq_simple_init();
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -	return 0;
 | 
	
		
			
				|  |  | +    return 0;
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  #endif
 |