Merge remote-tracking branch 'upstream/master'

Author: garryyan

mars/comm/dns/dns.cc

@@ -46,6 +46,11 @@ struct dnsinfo {
     int status;
 };
 
+static std::string DNSInfoToString(const struct dnsinfo& _info) {
+	XMessage msg;
+	msg(TSF"info:%@p, threadid:%_, dns:@%p, host_name:%_, status:%_", &_info, _info.threadid, _info.dns, _info.host_name, _info.status);
+	return msg.Message();
+}
 static std::vector<dnsinfo> sg_dnsinfo_vec;
 static Condition sg_condition;
 static Mutex sg_mutex;
@@ -231,12 +236,24 @@ bool DNS::GetHostByName(const std::string& _host_name, std::vector<std::string>&
             }
 
             if (kGetIPSuc == it->status) {
-                ips = it->result;
-
-                if (_breaker) _breaker->dnsstatus = NULL;
-
-                sg_dnsinfo_vec.erase(it);
-                return true;
+            	if (_host_name==it->host_name) {
+					ips = it->result;
+
+					if (_breaker) _breaker->dnsstatus = NULL;
+
+					sg_dnsinfo_vec.erase(it);
+					return true;
+            	} else {
+                    std::vector<dnsinfo>::iterator iter = sg_dnsinfo_vec.begin();
+                    int i = 0;
+                    for (; iter != sg_dnsinfo_vec.end(); ++iter) {
+                    	xerror2(TSF"sg_info_vec[%_]:%_", i++, DNSInfoToString(*iter));
+                    }
+                    if (monitor_func_)
+                    	monitor_func_(kDNSThreadIDError);
+            		xassert2(false, TSF"_host_name:%_, it->host_name:%_", _host_name, it->host_name);
+            		return false;
+            	}
             }
 
             if (kGetIPTimeout == it->status || kGetIPCancel == it->status || kGetIPFail == it->status) {

mars/comm/dns/dns.h

@@ -24,6 +24,8 @@
 #include <string>
 #include <vector>
 
+#include "boost/function.hpp"
+
 struct DNSBreaker {
 	DNSBreaker(): isbreak(false), dnsstatus(NULL) {}
 	bool isbreak;
@@ -43,8 +45,13 @@ class DNS {
     void Cancel(const std::string& _host_name = std::string());
     void Cancel(DNSBreaker& _breaker);
 
+    void SetMonitorFunc(const boost::function<void (int _key)>& _monitor_func) {
+    	monitor_func_ = _monitor_func;
+    }
   private:
     DNSFunc dnsfunc_;
+    boost::function<void (int _key)> monitor_func_;
+    static const int kDNSThreadIDError = 0;
 };
 
 

mars/comm/messagequeue/message_queue.cc

@@ -33,6 +33,7 @@
 #include "comm/anr.h"
 #include "comm/messagequeue/message_queue.h"
 #include "comm/time_utils.h"
+#include "comm/xlogger/xlogger.h"
 #ifdef __APPLE__
 #include "comm/debugger/debugger_utils.h"
 #endif
@@ -630,6 +631,8 @@ void RunLoop::Run() {
         ScopedLock lock(sg_messagequeue_map_mutex);
         sg_messagequeue_map[id].lst_runloop_info.push_back(RunLoopInfo());
     }
+    
+    xinfo_function(TSF"messagequeue id:%_", id);
 
     while (true) {
         ScopedLock lock(sg_messagequeue_map_mutex);
@@ -766,7 +769,7 @@ void MessageQueueCreater::__ThreadRunloop() {
     lock.unlock();
 
     RunLoop().Run();
-    messagequeue_id_ = 0;
+    
 }
 
 MessageQueue_t MessageQueueCreater::GetMessageQueue() {
@@ -780,7 +783,8 @@ MessageQueue_t MessageQueueCreater::CreateMessageQueue() {
 
     if (0 != thread_.start()) { return KInvalidQueueID;}
     messagequeue_id_ = __CreateMessageQueueInfo(breaker_, thread_.tid());
-
+    xinfo2(TSF"create messageqeue id:%_", messagequeue_id_);
+    
     return messagequeue_id_;
 }
 

mars/libraries/mars_android_sdk/jni/decode_mars_log_file.py.rewriteme

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]

mars/libraries/mars_android_sdk/jni/longlink_packer.h

@@ -12,7 +12,7 @@
 
 
 /*
- * longlink_packer.cpp
+ * longlink_packer.h
  *
  *  Created on: 2012-7-18
  *      Author: yerungui
@@ -34,7 +34,24 @@
 
 class AutoBuffer;
 
+/**
+ * package the request data
+ * _cmdid: business identifier
+ * _seq: task id
+ * _raw: business send buffer
+ * _packed: business send buffer + request header
+ */
 void longlink_pack(uint32_t _cmdid, uint32_t _seq, const void* _raw, size_t _raw_len, AutoBuffer& _packed);
+
+/**
+ * unpackage the response data
+ * _packed: data received from server
+ * _cmdid: business identifier
+ * _seq: task id
+ * _package_len:
+ * _body: business receive buffer
+ * return: 0 if unpackage succ
+ */
 int  longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq, size_t& _package_len, AutoBuffer& _body);
 
 //heartbeat signal to keep longlink network alive
@@ -47,6 +64,10 @@ void longlink_noop_resp_body(AutoBuffer& _body);
 uint32_t longlink_noop_interval();
 
 bool longlink_complexconnect_need_verify();
+
+/**
+ * return: whether the received data is pushing from server or not
+ */
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 
 #endif // STN_SRC_LONGLINKPACKER_H_

mars/log/crypt/decode_mars_log_file.py

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]

mars/stn/src/zombie_task_manager.cc

@@ -43,12 +43,12 @@ static bool __compare_task(const ZombieTask& first, const ZombieTask& second)
 }
 
 ZombieTaskManager::ZombieTaskManager(MessageQueue::MessageQueue_t _messagequeueid)
-		: m_asyncreg(MessageQueue::InstallAsyncHandler(_messagequeueid))
+		: asyncreg_(MessageQueue::InstallAsyncHandler(_messagequeueid))
 		, net_core_last_start_task_time_(gettickcount()) {}
 
 ZombieTaskManager::~ZombieTaskManager()
 {
-	m_asyncreg.CancelAndWait();
+	asyncreg_.CancelAndWait();
 }
 
 bool ZombieTaskManager::SaveTask(const Task& _task, unsigned int _taskcosttime)
@@ -65,7 +65,7 @@ bool ZombieTaskManager::SaveTask(const Task& _task, unsigned int _taskcosttime)
 
     xinfo2(TSF"task end callback zombie savetask cgi:%_, cmdid:%_, taskid:%_", _task.cgi, _task.cmdid, _task.taskid);
 
-    MessageQueue::SingletonMessage(false, m_asyncreg.Get(),
+    MessageQueue::SingletonMessage(false, asyncreg_.Get(),
                                     MessageQueue::Message((MessageQueue::MessageTitle_t)this,
                                     boost::bind(&ZombieTaskManager::__TimerChecker, this)),
                                     MessageQueue::MessageTiming(3000, 3000));
@@ -171,5 +171,5 @@ void ZombieTaskManager::__TimerChecker()
         }
     }
 
-    if (lsttask.empty()) MessageQueue::CancelMessage(m_asyncreg.Get(), (MessageQueue::MessageTitle_t)this);
+    if (lsttask.empty()) MessageQueue::CancelMessage(asyncreg_.Get(), (MessageQueue::MessageTitle_t)this);
 }

mars/stn/src/zombie_task_manager.h

@@ -61,7 +61,7 @@ class ZombieTaskManager {
     void __TimerChecker();
 
   private:
-    MessageQueue::ScopeRegister m_asyncreg;
+    MessageQueue::ScopeRegister asyncreg_;
     std::list<ZombieTask> lsttask_;
     uint64_t net_core_last_start_task_time_;
 };

samples/iOS/iOSDemoXlog/PublicComponentV2/decode_mars_log_file.py

@@ -93,7 +93,7 @@ def DecodeBuffer(_buffer, _offset, _outbuffer):
             decompressor = zlib.decompressobj(-zlib.MAX_WBITS)
             decompress_data = bytearray()
             while len(tmpbuffer) > 0:
-                single_log_len = struct.unpack_from("H", tmpbuffer[0:2])[0]
+                single_log_len = struct.unpack_from("H", buffer(tmpbuffer, 0, 2))[0]
                 #decompress_data.extend(base64.decodestring(tmpbuffer[2:single_log_len+2]))
                 decompress_data.extend(tmpbuffer[2:single_log_len+2])
                 tmpbuffer[:] = tmpbuffer[single_log_len+2:len(tmpbuffer)]