SVN-1621版本LWIP BUG

发布于 2011-07-10 15:03:06 浏览：8013 订阅该版

这两天更新到svn1623版本后，出现系统启动失败的情况，打印信息如下：

\ | /
- RT -     Thread Operating System
 / | \ 0.4.0 build Jul 10 2011
 2006 - 2011 Copyright by rt-thread team
thread:?0 ?0 ??0 ??0 ??0 ??0 ??0 ??0 ??0 ??0 ?0 ?0 
                                                   ?0 
                                                      ?0 ?0 ?0 ?0 ?0 $?0 $?0 ,?0 ,?0 4?0 4?0 <?0 <?0 D?0 D?0 L?0 L?0  thread  pri  status      sp     stack size max used   left tick  error
-------- ---- ------- ---------- ---------- ---------- ---------- ---
etx      0x90 suspend 0x00000044 0x00000400 0x00000114 0x00000010 000
erx      0x90 suspend 0x000000ac 0x00000400 0x000000ac 0x0000000f 000
---到此死机

经过版本跟踪后确定问题出在svn1621版本的更新上，svn1621更新了如下文件：
U    components/net/lwip-1.4.0/src/arch/include/arch/cc.h
U    components/net/lwip-1.4.0/src/arch/sys_arch.c
U    components/net/lwip/src/arch/include/arch/cc.h
U    components/net/lwip/src/arch/sys_arch.c
我使用的是lwip不是lwip-1.4.0，经过比较代码改动如下：

luohui@luohui-desktop:/work/mywork/RT-Thread/svn/rt-thread$ svn diff -r 1620:1621 components/net/lwip/src/arch/sys_arch.c 
Index: components/net/lwip/src/arch/sys_arch.c
===================================================================
--- components/net/lwip/src/arch/sys_arch.c	(版本 1620)
+++ components/net/lwip/src/arch/sys_arch.c	(版本 1621)
@@ -224,20 +224,29 @@
 	return t;
 }
 
-sys_prot_t sys_arch_protect(void)
-{
-	/* disable interrupt */
-	return rt_hw_interrupt_disable();
+sys_prot_t sys_arch_protect(void)
+{
+	rt_base_t level;
+
+	/* disable interrupt */
+	level = rt_hw_interrupt_disable();
+
+	/* must also lock scheduler */
+	rt_enter_critical();
+
+	return level;
+}
+
+void sys_arch_unprotect(sys_prot_t pval)
+{
+	/* unlock scheduler */
+	rt_exit_critical();
+
+	/* enable interrupt */
+	rt_hw_interrupt_enable(pval);
+
+	return;
 }
-
-void sys_arch_unprotect(sys_prot_t pval)
-{
-	/* enable interrupt */
-	rt_hw_interrupt_enable(pval);
-
-	return;
-}
-
 void sys_arch_assert(const char* file, int line)
 {
 	rt_kprintf("<br>Assertion: %d in %s, thread %s<br>", line, file,

luohui@luohui-desktop:/work/mywork/RT-Thread/svn/rt-thread$ svn diff -r 1620:1621 components/net/lwip/src/arch/include/arch/cc.h 
Index: components/net/lwip/src/arch/include/arch/cc.h
===================================================================
--- components/net/lwip/src/arch/include/arch/cc.h	(版本 1620)
+++ components/net/lwip/src/arch/include/arch/cc.h	(版本 1621)
@@ -92,9 +92,6 @@
 #define LWIP_PLATFORM_DIAG(x)	do {rt_kprintf x;} while(0)
 #define LWIP_PLATFORM_ASSERT(x) { rt_kprintf(x); sys_arch_assert(__FILE__, __LINE__); }
 
-#define SYS_ARCH_DECL_PROTECT(x)
-#define SYS_ARCH_PROTECT(x)
-#define SYS_ARCH_UNPROTECT(x)
 
 #include "string.h"
 
请帮忙确定这个问题原因。