SocketClient线程安全问题

Author: jarjin2000

Assets/LuaFramework/Scripts/Manager/NetworkManager.cs

@@ -7,7 +7,8 @@
 namespace LuaFramework {
     public class NetworkManager : Manager {
         private SocketClient socket;
-        static Queue<KeyValuePair<int, ByteBuffer>> sEvents = new Queue<KeyValuePair<int, ByteBuffer>>();
+        static readonly object m_lockObject = new object();
+        static Queue<KeyValuePair<int, ByteBuffer>> mEvents = new Queue<KeyValuePair<int, ByteBuffer>>();
 
         SocketClient SocketClient {
             get {
@@ -42,16 +43,18 @@ public object[] CallMethod(string func, params object[] args) {
 
         ///------------------------------------------------------------------------------------
         public static void AddEvent(int _event, ByteBuffer data) {
-            sEvents.Enqueue(new KeyValuePair<int, ByteBuffer>(_event, data));
+            lock (m_lockObject) {
+                mEvents.Enqueue(new KeyValuePair<int, ByteBuffer>(_event, data));
+            }
         }
 
         /// <summary>
         /// 交给Command，这里不想关心发给谁。
         /// </summary>
         void Update() {
-            if (sEvents.Count > 0) {
-                while (sEvents.Count > 0) {
-                    KeyValuePair<int, ByteBuffer> _event = sEvents.Dequeue();
+            if (mEvents.Count > 0) {
+                while (mEvents.Count > 0) {
+                    KeyValuePair<int, ByteBuffer> _event = mEvents.Dequeue();
                     facade.SendMessageCommand(NotiConst.DISPATCH_MESSAGE, _event);
                 }
             }

Assets/LuaFramework/Scripts/Manager/ThreadManager.cs

@@ -31,7 +31,7 @@ public class ThreadManager : Manager {
         private Stopwatch sw = new Stopwatch();
         private string currDownFile = string.Empty;
 
-        static readonly object m_lockObj = new object();
+        static readonly object m_lockObject = new object();
         static Queue<ThreadEvent> events = new Queue<ThreadEvent>();
 
         delegate void ThreadSyncEvent(NotiData data);
@@ -51,7 +51,7 @@ void Start() {
         /// 添加到事件队列
         /// </summary>
         public void AddEvent(ThreadEvent ev, Action<NotiData> func) {
-            lock (m_lockObj) {
+            lock (m_lockObject) {
                 this.func = func;
                 events.Enqueue(ev);
             }
@@ -69,7 +69,7 @@ private void OnSyncEvent(NotiData data) {
         // Update is called once per frame
         void OnUpdate() {
             while (true) {
-                lock (m_lockObj) {
+                lock (m_lockObject) {
                     if (events.Count > 0) {
                         ThreadEvent e = events.Dequeue();
                         try {

Assets/LuaFramework/Scripts/Network/SocketClient.cs

@@ -13,14 +13,15 @@ public enum DisType {
 }
 
 public class SocketClient {
+    public static bool loggedIn = false;
+
     private TcpClient client = null;
     private NetworkStream outStream = null;
     private MemoryStream memStream;
     private BinaryReader reader;
 
     private const int MAX_READ = 8192;
     private byte[] byteBuffer = new byte[MAX_READ];
-    public static bool loggedIn = false;
 
     // Use this for initialization
     public SocketClient() {
@@ -109,7 +110,6 @@ void OnRead(IAsyncResult asr) {
                 client.GetStream().BeginRead(byteBuffer, 0, MAX_READ, new AsyncCallback(OnRead), null);
             }
         } catch (Exception ex) {
-            //PrintBytes();
             OnDisconnected(DisType.Exception, ex.Message);
         }
     }