ת»»Ϊgb2312±àÂë
This commit is contained in:
@@ -39,7 +39,7 @@ typedef struct _thread
|
||||
#define INTERRUPT_ENABLE 0
|
||||
#define INTERRUPT_DISABLE 1
|
||||
|
||||
/* 线程挂起状态,共两种取值 */
|
||||
/* <EFBFBD>̹߳<EFBFBD><EFBFBD><EFBFBD>״̬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡֵ */
|
||||
#define SUSPEND_LOCK 0
|
||||
#define SUSPEND_SIGWAIT 1
|
||||
#define THREAD_RUNNING 2
|
||||
@@ -103,20 +103,20 @@ static void thread_suspend_signal_handler(int sig)
|
||||
thread_from = (thread_t *) rt_interrupt_from_thread;
|
||||
thread_to = (thread_t *) rt_interrupt_to_thread;
|
||||
|
||||
/* 注意!此时 rt_thread_self的值是to线程的值! */
|
||||
/* ע<EFBFBD>⣡<EFBFBD><EFBFBD>ʱ rt_thread_self<EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD>to<EFBFBD>̵߳<EFBFBD>ֵ<EFBFBD><EFBFBD> */
|
||||
tid = rt_thread_self();
|
||||
/* FIXME RT_ASSERT(thread_from->pthread == pid); */
|
||||
RT_ASSERT((thread_t *)(tid->sp) == thread_to);
|
||||
|
||||
TRACE("signal: SIGSUSPEND suspend <%s>\n", thread_from->rtthread->name);
|
||||
|
||||
/* 使用sigwait或者sigsuspend来挂起from线程 */
|
||||
/* ʹ<EFBFBD><EFBFBD>sigwait<EFBFBD><EFBFBD><EFBFBD><EFBFBD>sigsuspend<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>from<EFBFBD>߳<EFBFBD> */
|
||||
//sem_wait(&thread_from->sem);
|
||||
sigemptyset(&sigmask);
|
||||
sigaddset(&sigmask, MSG_RESUME);
|
||||
|
||||
/* Beginnig Linux Programming上说,当信号处理函数运行中,此信号就会被屏蔽,
|
||||
* 以防止重复执行信号处理函数
|
||||
/* Beginnig Linux Programming<EFBFBD><EFBFBD>˵<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>źŴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD>źžͻᱻ<EFBFBD><EFBFBD><EFBFBD>Σ<EFBFBD>
|
||||
* <EFBFBD>Է<EFBFBD>ֹ<EFBFBD>ظ<EFBFBD>ִ<EFBFBD><EFBFBD><EFBFBD>źŴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
*/
|
||||
thread_from->status = SUSPEND_SIGWAIT;
|
||||
if (sigwait(&sigmask, &sig) != 0)
|
||||
@@ -140,7 +140,7 @@ static void thread_resume_signal_handler(int sig)
|
||||
thread_from = (thread_t *) rt_interrupt_from_thread;
|
||||
thread_to = (thread_t *) rt_interrupt_to_thread;
|
||||
|
||||
/* 注意!此时 rt_thread_self的值是to线程的值! */
|
||||
/* ע<EFBFBD>⣡<EFBFBD><EFBFBD>ʱ rt_thread_self<EFBFBD><EFBFBD>ֵ<EFBFBD><EFBFBD>to<EFBFBD>̵߳<EFBFBD>ֵ<EFBFBD><EFBFBD> */
|
||||
tid = rt_thread_self();
|
||||
RT_ASSERT((thread_t *)(tid->sp) == thread_to);
|
||||
|
||||
@@ -171,9 +171,9 @@ static void *thread_run(void *parameter)
|
||||
thread->exit();
|
||||
|
||||
/*TODO:
|
||||
* 最后一行的pthread_exit永远没有机会执行,这是因为在threead->exit函数中
|
||||
* 会发生线程切换,并永久将此pthread线程挂起,所以更完美的解决方案是在这
|
||||
* 里发送信号给主线程,主线程中再次唤醒此线程令其自动退出。
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD>е<EFBFBD>pthread_exit<EFBFBD><EFBFBD>Զû<EFBFBD>л<EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD>threead->exit<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
* <EFBFBD>ᷢ<EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD>л<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ý<EFBFBD><EFBFBD><EFBFBD>pthread<EFBFBD>̹߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ľ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>źŸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>̣߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ٴλ<EFBFBD><EFBFBD>Ѵ<EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD>˳<EFBFBD><EFBFBD><EFBFBD>
|
||||
*/
|
||||
//sem_destroy(&thread->sem);
|
||||
|
||||
@@ -265,13 +265,13 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
interrupt_disable_flag = level;
|
||||
|
||||
pthread_mutex_unlock(ptr_int_mutex);
|
||||
/* 如果已经中断仍然关闭 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD>ж<EFBFBD><EFBFBD><EFBFBD>Ȼ<EFBFBD>ر<EFBFBD> */
|
||||
if (interrupt_disable_flag)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* 表示当前中断打开, 检查是否有挂起的中断 */
|
||||
/* <EFBFBD><EFBFBD>ʾ<EFBFBD><EFBFBD>ǰ<EFBFBD>жϴ<EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><C7B7>й<EFBFBD><D0B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD> */
|
||||
pthread_mutex_lock(ptr_int_mutex);
|
||||
if (!cpu_pending_interrupts)
|
||||
{
|
||||
@@ -287,9 +287,9 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
//pid != mainthread_pid &&
|
||||
if (thread_from->pthread == pid)
|
||||
{
|
||||
/* 注意这段代码是在RTT普通线程函数总函数中执行的,
|
||||
* from线程就是当前rtt线程 */
|
||||
/* 需要检查是否有挂起的中断需要处理 */
|
||||
/* ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>RTT<EFBFBD><EFBFBD>ͨ<EFBFBD>̺߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܺ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD>еģ<EFBFBD>
|
||||
* from<EFBFBD>߳̾<EFBFBD><EFBFBD>ǵ<EFBFBD>ǰrtt<EFBFBD>߳<EFBFBD> */
|
||||
/* <EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD>й<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ж<EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
TRACE("conswitch: P in pid<%x> ,suspend <%s>, resume <%s>!\n",
|
||||
(unsigned int)pid,
|
||||
thread_from->rtthread->name,
|
||||
@@ -298,7 +298,7 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
cpu_pending_interrupts --;
|
||||
thread_from->status = SUSPEND_LOCK;
|
||||
pthread_mutex_unlock(ptr_int_mutex);
|
||||
/* 唤醒被挂起的线程 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD>ѱ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD> */
|
||||
if (thread_to->status == SUSPEND_SIGWAIT)
|
||||
{
|
||||
pthread_kill(thread_to->pthread, MSG_RESUME);
|
||||
@@ -313,7 +313,7 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
/* 挂起当前的线程 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD> */
|
||||
sem_wait(& thread_from->sem);
|
||||
pthread_mutex_lock(ptr_int_mutex);
|
||||
thread_from->status = THREAD_RUNNING;
|
||||
@@ -321,9 +321,9 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
}
|
||||
else
|
||||
{
|
||||
/* 注意这段代码可能在多种情况下运行:
|
||||
* 1. 在system tick中执行, 即主线程的SIGALRM信号处理函数中执行
|
||||
* 2. 其他线程中调用,比如用于获取按键输入的线程中调用
|
||||
/* ע<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD>
|
||||
* 1. <EFBFBD><EFBFBD>system tick<EFBFBD><EFBFBD>ִ<EFBFBD>У<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>̵߳<DFB3>SIGALRM<52>źŴ<C5BA><C5B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><D6B4>
|
||||
* 2. <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD>ã<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڻ<EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD>е<EFBFBD><EFBFBD><EFBFBD>
|
||||
*/
|
||||
TRACE("conswitch: S in pid<%x> ,suspend <%s>, resume <%s>!\n",
|
||||
(unsigned int)pid,
|
||||
@@ -332,19 +332,19 @@ void rt_hw_interrupt_enable(rt_base_t level)
|
||||
|
||||
cpu_pending_interrupts --;
|
||||
|
||||
/* 需要把解锁函数放在前面,以防止死锁?? */
|
||||
/* <EFBFBD><EFBFBD>Ҫ<EFBFBD>ѽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ǰ<EFBFBD><EFBFBD>,<2C>Է<EFBFBD>ֹ<EFBFBD><D6B9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
pthread_mutex_unlock(ptr_int_mutex);
|
||||
|
||||
/* 挂起from线程 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>from<EFBFBD>߳<EFBFBD> */
|
||||
pthread_kill(thread_from->pthread, MSG_SUSPEND);
|
||||
/* 注意:这里需要确保线程被挂起了, 否则312行就很可能就会报错退出
|
||||
* 因为这里挂起线程是通过信号实现的,所以一定要确保线程挂起才行 */
|
||||
/* ע<EFBFBD>⣺<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫȷ<EFBFBD><EFBFBD><EFBFBD>̱߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD>312<31>оͺܿ<CDBA><DCBF>ܾͻᱨ<CDBB><E1B1A8><EFBFBD>˳<EFBFBD>
|
||||
* <EFBFBD><EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>߳<EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><EFBFBD><EFBFBD>ź<EFBFBD>ʵ<EFBFBD>ֵģ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD>Ҫȷ<EFBFBD><EFBFBD><EFBFBD>̹߳<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> */
|
||||
while (thread_from->status != SUSPEND_SIGWAIT)
|
||||
{
|
||||
sched_yield();
|
||||
}
|
||||
|
||||
/* 唤醒to线程 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>to<EFBFBD>߳<EFBFBD> */
|
||||
if (thread_to->status == SUSPEND_SIGWAIT)
|
||||
{
|
||||
pthread_kill(thread_to->pthread, MSG_RESUME);
|
||||
@@ -374,7 +374,7 @@ void rt_hw_context_switch(rt_uint32_t from,
|
||||
RT_ASSERT(from != to);
|
||||
|
||||
#if 0
|
||||
//TODO: 可能还需要考虑嵌套切换的情况
|
||||
//TODO: <EFBFBD><EFBFBD><EFBFBD>ܻ<EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƕ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
if (rt_thread_switch_interrupt_flag != 1)
|
||||
{
|
||||
rt_thread_switch_interrupt_flag = 1;
|
||||
@@ -387,8 +387,8 @@ void rt_hw_context_switch(rt_uint32_t from,
|
||||
rt_interrupt_from_thread = *((rt_uint32_t *)from);
|
||||
rt_interrupt_to_thread = *((rt_uint32_t *)to);
|
||||
|
||||
/* 这个函数只是并不会真正执行中断处理函数,而只是简单的
|
||||
* 设置一下中断挂起标志位
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>Dz<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ִ<EFBFBD><EFBFBD><EFBFBD>жϴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD>Ǽ<EFBFBD>
|
||||
* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD>жϹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־λ
|
||||
*/
|
||||
cpu_pending_interrupts ++;
|
||||
pthread_mutex_unlock(ptr_int_mutex);
|
||||
@@ -409,7 +409,7 @@ void rt_hw_context_switch_to(rt_uint32_t to)
|
||||
rt_interrupt_from_thread = 0;
|
||||
|
||||
//set interrupt to 1
|
||||
rt_thread_switch_interrupt_flag = 0; //TODO: 还需要考虑这个嵌套切换的情况
|
||||
rt_thread_switch_interrupt_flag = 0; //TODO: <EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƕ<EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
/* enable interrupt
|
||||
* note: NOW, there are only one interrupt in simposix: system tick */
|
||||
@@ -435,7 +435,7 @@ static int mainthread_scheduler(void)
|
||||
mainthread_pid = pthread_self();
|
||||
TRACE("pid <%08x> mainthread\n", (unsigned int)(mainthread_pid));
|
||||
|
||||
/* 屏蔽suspend信号和resume信号 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>suspend<EFBFBD>źź<EFBFBD>resume<EFBFBD>ź<EFBFBD> */
|
||||
sigemptyset(&sigmask);
|
||||
sigaddset(&sigmask, MSG_SUSPEND);
|
||||
sigaddset(&sigmask, MSG_RESUME);
|
||||
@@ -472,7 +472,7 @@ static int mainthread_scheduler(void)
|
||||
pause();
|
||||
#endif
|
||||
TRACE("mthread:got sig %d\n", sig);
|
||||
/* signal mask sigalrm 屏蔽SIGALRM信号 */
|
||||
/* signal mask sigalrm <EFBFBD><EFBFBD><EFBFBD><EFBFBD>SIGALRM<EFBFBD>ź<EFBFBD> */
|
||||
pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask);
|
||||
|
||||
// if (systick_signal_flag != 0)
|
||||
@@ -487,7 +487,7 @@ static int mainthread_scheduler(void)
|
||||
TRACE("try lock failed.\n");
|
||||
}
|
||||
|
||||
/* 开启SIGALRM信号 */
|
||||
/* <EFBFBD><EFBFBD><EFBFBD><EFBFBD>SIGALRM<EFBFBD>ź<EFBFBD> */
|
||||
pthread_sigmask(SIG_UNBLOCK, &sigmask, &oldmask);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user