rhodes 3.3.3.beta.4 → 3.3.3

data/platform/shared/json/JSONIterator.cpp

@@ -30,7 +30,7 @@
 #ifndef RHO_NO_RUBY
 #include "ruby/ext/rho/rhoruby.h"
 #endif //RHO_NO_RUBY
-#if defined(OS_WINCE) || defined (OS_WINDOWS)
+#if defined(WINDOWS_PLATFORM)
 #define rho_atoi64 _atoi64
 #elif defined(OS_SYMBIAN)
 long long int rho_atoi64(const char *instr)

data/platform/shared/json/RJSONTokener.c

@@ -592,6 +592,8 @@ VALUE rho_json_parse(VALUE v,VALUE str)
 
     RAWLOG_ERROR1("Incorrect json body.Error:%s", (szError ? szError:""));
 
+    rho_ruby_raise_runtime(szError);
+
     if ( szError )
         free(szError);
 

data/platform/shared/json/config.h

@@ -143,9 +143,9 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 /* #undef size_t */
 
-#if !defined(OS_ANDROID)
-#include "tcmalloc/rhomem.h"
-#endif
+//#if !defined(OS_ANDROID)
+//#include "tcmalloc/rhomem.h"
+//#endif
 
 #if defined(WIN32)
 

data/platform/shared/logging/RhoLog.cpp

@@ -38,15 +38,24 @@ const char*const LogSeverityNames[L_NUM_SEVERITIES] = {
 
 namespace rho {
 
-LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogSettings& oSettings, const LogCategory& category ) : 
-    m_severity(severity), m_category(category), m_oLogConf(oSettings){
+LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogSettings& oSettings, const LogCategory& category) : 
+    m_severity(severity), m_category(category), m_oLogConf(oSettings), m_bForceEnable(false){
+    if ( getLogConf().isLogPrefix() && isEnabled() )
+        addPrefix( file, line );
+}
+
+LogMessage::LogMessage(const char* file, int line, LogSeverity severity, LogSettings& oSettings, const LogCategory& category, boolean bForceEnable) : 
+    m_severity(severity), m_category(category), m_oLogConf(oSettings), m_bForceEnable(bForceEnable){
     if ( getLogConf().isLogPrefix() && isEnabled() )
         addPrefix( file, line );
 }
 
 bool LogMessage::isEnabled()const{
 	if(m_category.getName() == "NO_LOGGING" || common::CThreadQueue::getLogThreadId() == common::CSystem::getThreadID()) return false;
-	
+
+    if ( m_bForceEnable )
+        return true;
+
 	if ( m_severity >= getLogConf().getMinSeverity() ){
         if ( m_category.isEmpty() || m_severity >= L_ERROR )
             return true;

data/platform/shared/logging/RhoLog.h

@@ -85,13 +85,14 @@ private:
     LogSeverity m_severity;
     LogCategory m_category;
     String m_strMessage;
-
+    boolean m_bForceEnable;
     LogFormat m_lastFmt;
 
     LogSettings& m_oLogConf;
 public:
 
     LogMessage(const char* file, int line, LogSeverity severity, LogSettings& oSettings, const LogCategory& category);
+    LogMessage(const char* file, int line, LogSeverity severity, LogSettings& oSettings, const LogCategory& category, boolean bForceEnable);
 
     ~LogMessage(){ flushLog(); }
 

data/platform/shared/logging/RhoLogConf.cpp

@@ -41,9 +41,70 @@ namespace rho{
 common::CMutex LogSettings::m_FlushLock;
 common::CMutex LogSettings::m_CatLock;
 
+
+LogSettings::MemoryInfoCollectorThread::MemoryInfoCollectorThread( LogSettings& logSettings ) :
+    m_pCollector(0), m_logSettings(logSettings), m_collectMemoryIntervalMilliseconds(0)
+{
+    
+}
+
+void LogSettings::MemoryInfoCollectorThread::run()
+{
+    while( !isStopping() )    
+    {
+        unsigned int toWait = 0;
+        {
+            common::CMutexLock lock(m_accessLock);
+            toWait = m_collectMemoryIntervalMilliseconds;
+        }
+        
+        if ( 0 == toWait )
+        {
+            continue;   
+        }
+        
+        wait(toWait / 1000);
+
+        if (!isStopping())
+        {
+            common::CMutexLock lock(m_accessLock);
+            if ( m_pCollector!=0 )
+            {
+                String str = m_pCollector->collect();
+
+                LogCategory oLogCat("MEMORY");
+                rho::LogMessage oLogMsg(__FILE__, __LINE__, L_INFO, LOGCONF(), oLogCat, true );
+                oLogMsg + str;
+
+                //m_logSettings.sinkLogMessage( str );
+            }            
+        }        
+    }
+}
+
+void LogSettings::MemoryInfoCollectorThread::setCollectMemoryInfoInterval( unsigned int interval )
+{
+    common::CMutexLock lock(m_accessLock);
+    m_collectMemoryIntervalMilliseconds = interval;
+}
+
+void LogSettings::MemoryInfoCollectorThread::setMemoryInfoCollector( IMemoryInfoCollector* memInfoCollector )
+{
+    common::CMutexLock lock(m_accessLock); 
+    m_pCollector = memInfoCollector;   
+}
+
+boolean LogSettings::MemoryInfoCollectorThread::willCollect() const
+{
+    common::CMutexLock lock(m_accessLock); 
+    return (m_collectMemoryIntervalMilliseconds>0) && (m_pCollector!=0);
+}
+
+
 LogSettings g_LogSettings;
 
-LogSettings::LogSettings(){ 
+LogSettings::LogSettings()
+{ 
     m_nMinSeverity = 0; 
     m_bLogToOutput = true; 
     m_bLogToFile = false;
@@ -58,9 +119,17 @@ LogSettings::LogSettings(){
     m_pOutputSink = new CLogOutputSink(*this);
     m_pLogViewSink = NULL;
 	m_pSocketSink = NULL;
+	m_pMemoryInfoCollector = NULL;
+    m_pMemoryCollectorThread = NULL;
 }
 
 LogSettings::~LogSettings(){
+    
+    if ( m_pMemoryCollectorThread != 0 )
+    {
+        m_pMemoryCollectorThread->stop(1);
+        delete m_pMemoryCollectorThread;
+    }
     delete m_pFileSink;
     delete m_pOutputSink;
 	if(m_pSocketSink)
@@ -93,6 +162,13 @@ void LogSettings::initRemoteLog()
 		m_pSocketSink = new CLogSocketSink(*this);
 }
 
+void LogSettings::reinitRemoteLog() {
+    closeRemoteLog();
+	if(!m_pSocketSink && m_strLogURL != "")
+		m_pSocketSink = new CLogSocketSink(*this);
+}
+
+
 void LogSettings::getLogTextW(StringW& strTextW)
 {
     boolean bOldSaveToFile = isLogToFile();
@@ -126,7 +202,7 @@ void LogSettings::saveToFile(){
     RHOCONF().setInt("MinSeverity", getMinSeverity(), true );
     RHOCONF().setBool("LogToOutput", isLogToOutput(), true );
     RHOCONF().setBool("LogToFile", isLogToFile(), true );
-#if !defined(OS_MACOSX)	
+#if !defined(OS_MACOSX) 
     RHOCONF().setString("LogFilePath", getLogFilePath(), true );
 #endif
     RHOCONF().setInt("MaxLogFileSize", getMaxLogFileSize(), true );
@@ -154,6 +230,11 @@ void LogSettings::loadFromConf(rho::common::RhoSettings& oRhoConf)
 		setLogToSocket( oRhoConf.getBool("LogToSocket") );
 	if ( oRhoConf.isExist( "log_exclude_filter") )
         setExcludeFilter( oRhoConf.getString("log_exclude_filter") );
+	if ( oRhoConf.isExist( "LogMemPeriod" ) )
+	{
+		int milliseconds = oRhoConf.getInt("LogMemPeriod");
+		setCollectMemoryInfoInterval(milliseconds);
+	}
 }
 
 void LogSettings::setLogFilePath(const char* szLogFilePath){ 
@@ -179,9 +260,20 @@ void LogSettings::clearLog(){
 }
 
 void LogSettings::sinkLogMessage( String& strMsg ){
+    /*
+	String logMemory ("");
+    processMemoryInfo( logMemory );
+	if (logMemory.length() > 0)
+		internalSinkLogMessage(logMemory);
+    */
+
+	internalSinkLogMessage(strMsg);
+}
+
+void LogSettings::internalSinkLogMessage( String& strMsg ){
     common::CMutexLock oLock(m_FlushLock);
 
-    if ( isLogToFile() )
+	if ( isLogToFile() )
         m_pFileSink->writeLogMessage(strMsg);
 
     if (m_pLogViewSink)
@@ -239,12 +331,48 @@ void LogSettings::setExcludeFilter( const String& strExcludeFilter )
 
             //m_arExcludeAttribs.addElement( "\"" + tok + "\"=>\"" );
             m_arExcludeAttribs.addElement( tok );
-        }    	
+        } 
     }
     else
     	m_arExcludeAttribs.removeAllElements();
 }
 
+void LogSettings::setCollectMemoryInfoInterval( unsigned int interval )
+{ 
+    if ( 0 == m_pMemoryCollectorThread )
+    {
+        m_pMemoryCollectorThread = new MemoryInfoCollectorThread(*this);
+    }
+    
+    m_pMemoryCollectorThread->setCollectMemoryInfoInterval(interval);
+    if ( m_pMemoryCollectorThread->willCollect() )
+    {        
+        m_pMemoryCollectorThread->start(common::IRhoRunnable::epLow);        
+    } 
+    else 
+    {
+        m_pMemoryCollectorThread->stop(0);        
+    }
+}
+
+void LogSettings::setMemoryInfoCollector( IMemoryInfoCollector* memInfoCollector ) 
+{
+    if ( 0 == m_pMemoryCollectorThread )
+    {
+        m_pMemoryCollectorThread = new MemoryInfoCollectorThread(*this);
+    }
+    
+    m_pMemoryCollectorThread->setMemoryInfoCollector(memInfoCollector);
+    if ( m_pMemoryCollectorThread->willCollect() )
+    {
+        m_pMemoryCollectorThread->start(common::IRhoRunnable::epLow);        
+    } 
+    else 
+    {
+        m_pMemoryCollectorThread->stop(0);        
+    }
+}
+
 }
 
 extern "C" {
@@ -253,7 +381,7 @@ using namespace rho::common;
 
 void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char* szRootPath, const char* szLogPort, const char* szUserPath)
 {
-    
+
 #ifdef RHODES_EMULATOR
     String strRootPath = szLogPath;
     strRootPath += RHO_EMULATOR_DIR"/";
@@ -261,7 +389,7 @@ void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char*
 #else
     rho::common::CFilePath oLogPath( szLogPath );
 #endif
-    
+
     //Set defaults
 #ifdef RHO_DEBUG
     LOGCONF().setMinSeverity( L_TRACE );
@@ -273,19 +401,19 @@ void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char*
     LOGCONF().setLogToOutput(false);
     LOGCONF().setEnabledCategories("");
 #endif//!RHO_DEBUG
-    
+
     LOGCONF().setLogPrefix(true);
-    
+
     rho::String logPath = oLogPath.makeFullPath("rholog.txt");
     LOGCONF().setLogToFile(true);
     LOGCONF().setLogFilePath( logPath.c_str() );
     LOGCONF().setMaxLogFileSize(1024*50);
-    
+
     rho_conf_Init_with_separate_user_path(szRootPath, szUserPath);
-    
+
     LOGCONF().loadFromConf(RHOCONF());
 }
-    
+
 void rho_logconf_Init(const char* szLogPath, const char* szRootPath, const char* szLogPort){
     rho_logconf_Init_with_separate_user_path(szLogPath, szRootPath, szLogPort, szRootPath);
 }
@@ -406,6 +534,14 @@ VALUE rho_conf_read_log(int limit)
 
     return res;
 }
+
+
+void rho_log_resetup_http_url(const char* http_log_url) {
+    LOGCONF().setLogURL(http_log_url);
+    LOGCONF().reinitRemoteLog();
+}
+
+
 #endif //RHO_NO_RUBY
 
 }

data/platform/shared/logging/RhoLogConf.h

@@ -32,6 +32,8 @@
 #include "common/RhoStd.h"
 //#include "RhoPlainLog.h"
 #include "common/RhoMutexLock.h"
+#include "common/RhoTime.h"
+#include "common/RhoThread.h"
 
 namespace rho {
 
@@ -45,7 +47,32 @@ struct ILogSink{
     virtual void clear() = 0;
 };
 
+class IMemoryInfoCollector
+{
+public:
+    virtual ~IMemoryInfoCollector() {}
+    virtual String collect() = 0;
+};
+
 class LogSettings{
+    
+    class MemoryInfoCollectorThread : public common::CRhoThread
+    {
+        unsigned int            m_collectMemoryIntervalMilliseconds;
+        IMemoryInfoCollector*   m_pCollector;
+        LogSettings&            m_logSettings;
+        
+        mutable common::CMutex  m_accessLock;
+    public:
+        MemoryInfoCollectorThread( LogSettings& logSettings );
+        virtual void run();
+        
+        void setCollectMemoryInfoInterval( unsigned int interval );
+        void setMemoryInfoCollector( IMemoryInfoCollector* memInfoCollector );
+        
+        boolean willCollect() const;
+    };
+    
     LogSeverity m_nMinSeverity;
     bool        m_bLogToOutput;
     bool        m_bLogToSocket;
@@ -54,6 +81,8 @@ class LogSettings{
     String      m_strLogFilePath;
 //    String      m_strLogConfFilePath;
     unsigned int m_nMaxLogFileSize;
+    
+    MemoryInfoCollectorThread* m_pMemoryCollectorThread;
 
 	String      m_strLogURL;
 
@@ -66,6 +95,7 @@ class LogSettings{
     ILogSink*   m_pOutputSink;
     ILogSink*   m_pLogViewSink;
     ILogSink*   m_pSocketSink;
+    IMemoryInfoCollector* m_pMemoryInfoCollector;
 
     static common::CMutex m_FlushLock;
     static common::CMutex m_CatLock;
@@ -102,6 +132,7 @@ public:
 	void setLogURL(const char* szLogURL) { m_strLogURL = rho::String(szLogURL); }
 
 	void initRemoteLog();
+    void reinitRemoteLog();
 	void closeRemoteLog();
 
     void setEnabledCategories( const char* szCatList );
@@ -109,6 +140,9 @@ public:
     const String& getEnabledCategories(){ return m_strEnabledCategories; }
     const String& getDisabledCategories(){ return m_strDisabledCategories; }
     bool isCategoryEnabled(const LogCategory& cat)const;
+    
+    void setCollectMemoryInfoInterval( unsigned int interval );
+    void setMemoryInfoCollector( IMemoryInfoCollector* memInfoCollector );
 
     void setExcludeFilter( const String& strExcludeFilter );
     Vector<String>& getExcludeAttribs(){ return m_arExcludeAttribs; }
@@ -118,7 +152,7 @@ public:
     void getLogText(String& strText);
     void getLogTextW(StringW& strTextW);
     int  getLogTextPos();
-	
+
 	void setLogView(ILogSink* logView) { 
 		m_pLogViewSink = logView; 
 	}
@@ -132,6 +166,8 @@ public:
     void saveToFile();
     void loadFromConf(rho::common::RhoSettings& oRhoConf);
 
+private:
+	void internalSinkLogMessage( String& strMsg );
 };
 
 extern LogSettings g_LogSettings;
@@ -167,6 +203,8 @@ void rho_logconf_freeString(char* str);
 
 int rho_conf_send_log(const char* callback_url);
 void rho_conf_clean_log();
+    
+void rho_log_resetup_http_url(const char* http_log_url);    
 
 #ifdef __cplusplus
 }

data/platform/shared/logging/RhoLogSink.cpp

@@ -145,7 +145,7 @@ void CLogOutputSink::writeLogMessage( String& strMsg )
 
     const char* szMsg = strMsg.c_str(); 
 
-#if defined( OS_WINDOWS )
+#if defined( OS_WINDOWS_DESKTOP )
 		::OutputDebugStringA(szMsg);
 #elif defined( OS_PLATFORM_MOTCE )
 		::OutputDebugStringW(common::convertToStringW(strMsg).c_str());

data/platform/shared/net/HttpServer.cpp

@@ -81,7 +81,7 @@ using namespace rho::common;
 
 IMPLEMENT_LOGCLASS(CHttpServer, "HttpServer");
 
-#if defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(WINDOWS_PLATFORM)
 static size_t const FILE_BUF_SIZE = 64*1024;
 #else
 static size_t const FILE_BUF_SIZE = 256*1024;
@@ -463,8 +463,12 @@ bool CHttpServer::run()
             return false;
         }
 
-        //if ( bProcessed )
+        if ( bProcessed )
+        {
+            LOG(INFO) + "GC Start.";
             rb_gc();
+            LOG(INFO) + "GC End.";
+        }
     }
 }
 
@@ -1109,7 +1113,7 @@ bool CHttpServer::send_file(String const &path, HeaderList const &hdrs)
     fclose(fp);
     delete buf;
     if (verbose) RAWTRACE1("File %s was sent successfully", path.c_str());
-    return true;
+    return false;
 }
 
 bool CHttpServer::call_ruby_method(String const &uri, String const &body, String& strReply)
@@ -1137,7 +1141,7 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
     if (callback) {
         RAWTRACE1("Uri %s is registered callback, so handle it appropriately", arg_uri.c_str());
         callback(this, query.length() ? query : body);
-        return true;
+        return false;
     }
 
     String uri = arg_uri;