rhodes 5.5.2 → 5.5.15

data/platform/iphone/rbuild/putsOverride.rake

@@ -0,0 +1,8 @@
+def puts(o=nil)
+    if o != nil
+        $stdout.puts(o)
+        if $out_file_buf_enable
+            $out_file_buf << o.to_s
+        end
+    end
+end

data/platform/shared/api_generator/iphone/CJSConverter.mm

@@ -4,10 +4,12 @@
 #import "CMethodResult.h"
 
 #import "json/JSONIterator.h"
+#import "logging/RhoLog.h"
 
 @implementation CJSConverter
 
-
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "CJSConverter.h"
 
 + (NSString*) quoteString:(NSString*)str {
     return [NSString stringWithUTF8String:rho::json::CJSONEntry::quoteValue([str UTF8String]).c_str()];
@@ -153,7 +155,7 @@
                 [ns_array addObject:obj];
             }
             else {
-                NSLog(@"ERROR during convert JSON data !");
+                RAWLOG_ERROR1("ERROR during convert JSON data 1 ! data = %s", jsonEntry->getString());
             }
         }
         return ns_array;
@@ -173,7 +175,7 @@
                 [ns_hash setObject:obj forKey:[NSString stringWithUTF8String:(key.c_str())]];
             }
             else {
-                NSLog(@"ERROR during convert JSON data !");
+                RAWLOG_ERROR1("ERROR during convert JSON data 2 ! data = %s", jsonEntry->getString());
             }
             
             js_iterator.next();

data/platform/shared/common/BundleManager.cpp

@@ -68,7 +68,7 @@ void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg)
 }
 #endif
 
-
+extern "C" void rho_startup_logging(const char* message);
 
 
 extern "C" void rho_file_operation_test() {
@@ -456,13 +456,16 @@ void CFileTransaction::commit()
 
 unsigned int CFileTransaction::rollback()
 {
-    LOG(TRACE) + "FileTransaction is rolling back: " + m_strFolder;
-
+    if (rho_log_system_is_ready()) {
+        LOG(TRACE) + "FileTransaction is rolling back: " + m_strFolder;
+    }
     String strFolder = m_strFolder;
     m_strFolder = "";
 
     if ( strFolder.length() == 0 ) {
-        LOG(TRACE) + "FileTransaction rolling back: empty transaction" + m_strFolder;
+        if (rho_log_system_is_ready()) {
+            LOG(TRACE) + "FileTransaction rolling back: empty transaction" + m_strFolder;
+        }
         return 0;
     }
 
@@ -470,6 +473,9 @@ unsigned int CFileTransaction::rollback()
     CRhoFile::deleteFolder( (strFolder + "_temp_journal").c_str() );
 
     if ( !CRhoFile::isFileExist((strFolder + "_journal").c_str()) )
+        if (rho_log_system_is_ready()) {
+            LOG(TRACE) + "FileTransaction stop: file not exist : " + (strFolder + "_journal");
+        }
         return 0;
 
     m_nError = CRhoFile::deleteFolder( (strFolder).c_str() );
@@ -488,7 +494,9 @@ unsigned int CFileTransaction::rollback()
         return m_nError;
     }
 
-    LOG(TRACE) + "FileTransaction has rolled back";
+    if (rho_log_system_is_ready()) {
+        LOG(TRACE) + "FileTransaction has rolled back";
+    }
 
     return m_nError;
 }
@@ -1290,7 +1298,9 @@ void rho_sys_replace_current_bundle(const char* path, rho_param *p)
 
 int rho_sys_check_rollback_bundle(const char* szRhoPath)
 {
-    LOG(INFO) + "rho_sys_check_rollback_bundle()";
+    if (rho_log_system_is_ready()) {
+        LOG(INFO) + "rho_sys_check_rollback_bundle()";
+    }
     CFileTransaction oFT( CFilePath::join(szRhoPath, "apps"), false );
     return oFT.rollback() != 0 ? 0 : 1;
 }

data/platform/shared/common/PosixThreadImpl.cpp

@@ -113,11 +113,17 @@ int CPosixThreadImpl::wait(unsigned int nTimeoutMs)
     if (timed_wait)
     {
         gettimeofday(&tp, NULL);
+        
+        
+        unsigned long long nanosecs = tp.tv_usec * 1000 + ((unsigned long long)nTimeoutMs)*((unsigned long long)1000000);
+        unsigned long long nanosec_sec = nanosecs / ((unsigned long long)1000000000);
+        nanosecs = nanosecs - (nanosec_sec * ((unsigned long long)1000000000));
+        
         /* Convert from timeval to timespec */
-        ts.tv_sec  = tp.tv_sec;
-        ts.tv_nsec = tp.tv_usec * 1000 + ((unsigned long long)(nTimeoutMs - nTimeout*1000))*1000000;
-        ts.tv_sec += nTimeout;
-        max = ((unsigned long long)tp.tv_sec + nTimeout)*1000000 + tp.tv_usec;
+        ts.tv_sec  = tp.tv_sec + nanosec_sec;
+        ts.tv_nsec = nanosecs;//tp.tv_usec * 1000 + ((unsigned long long)(nTimeoutMs - nTimeout*1000))*1000000;
+        //ts.tv_sec += nTimeout;
+        max = ((unsigned long long)tp.tv_sec)*1000000 + tp.tv_usec + ((unsigned long long)nTimeoutMs)*((unsigned long long)1000);
     }
 
     common::CMutexLock oLock(m_mxSync);

data/platform/shared/common/RhoTime.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,13 +20,39 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
 #include "common/RhoTime.h"
 #include "common/RhodesApp.h"
 
+#include "common/RhoConf.h"
+
+
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoTimer"
+
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
+
+
 namespace rho{
 namespace common{
 
@@ -143,33 +169,34 @@ boolean CRhoTimer::checkTimers()
     for( int i = (int)m_arItems.size()-1; i >= 0; i--)
     {
         CTimerItem oItem = m_arItems.elementAt(i);
-		if(oItem.m_overflow==false)
-		{
-
-			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-                RAWTRACE("CRhoTimer::checkTimers: firing timer");
-				m_arItems.removeElementAt(i);
-				if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-					bRet = true;
-			}
-
-		}
-		else
-		{
-			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-				{
+        
+            if(oItem.m_overflow==false)
+            {
+                
+                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+                {
                     RAWTRACE("CRhoTimer::checkTimers: firing timer");
-					m_arItems.removeElementAt(i);
-					if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-						bRet = true;
-				}
-
-			}
-
-		}
+                    m_arItems.removeElementAt(i);
+                    if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                        bRet = true;
+                }
+                
+            }
+            else
+            {
+                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+                {
+                    if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+                    {
+                        RAWTRACE("CRhoTimer::checkTimers: firing timer");
+                        m_arItems.removeElementAt(i);
+                        if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                            bRet = true;
+                    }
+                    
+                }
+                
+            }
     }
 
     for( int i = (int)m_arNativeItems.size()-1; i >= 0; i--)
@@ -177,28 +204,42 @@ boolean CRhoTimer::checkTimers()
         CNativeTimerItem oItem = m_arNativeItems.elementAt(i);
         
         if(oItem.m_overflow==false)
-		{
+        {
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
             {
                 RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                 m_arNativeItems.removeElementAt(i);
-                if ( oItem.m_pCallback->onTimer() )
+                if (is_net_trace()) {
+                    RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 1 TIMER");
+                }
+                if ( oItem.m_pCallback->onTimer() ) {
                     bRet = true;
+                }
+                if (is_net_trace()) {
+                    RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 1 TIMER");
+                }
             }
         }
         else
         {
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-				{
+            {
+                if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+                {
                     RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                     m_arNativeItems.removeElementAt(i);
-                    if ( oItem.m_pCallback->onTimer() )
+                    if (is_net_trace()) {
+                        RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 2 TIMER");
+                    }
+                    if ( oItem.m_pCallback->onTimer() ) {
                         bRet = true;
-				}
-
-			}
+                    }
+                    if (is_net_trace()) {
+                        RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 2 TIMER");
+                    }
+                }
+                
+            }
         }
     }
 

data/platform/shared/common/RhodesApp.cpp

@@ -2641,7 +2641,7 @@ int rho_http_get_port()
 }
 
 #ifdef OS_MACOSX
-const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int* responseLength )
+const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength )
 {
 
   String sMethod;
@@ -2663,7 +2663,7 @@ const char* rho_http_direct_request( const char* method, const char* uri, const
   }
   
   if ( body != 0 ) {
-    sBody = body;
+    sBody.assign(body, bodylen);
   }
   
   if ( headers != 0 ) {

data/platform/shared/common/RhodesApp.h

@@ -361,7 +361,7 @@ int rho_http_started();
 int rho_http_get_port();
 
 #ifdef OS_MACOSX
-const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int* responseLength );
+const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength );
 void rho_http_free_response( const char* data );
 
 void* rho_http_init_headers_list();

data/platform/shared/db/DBAdapter.cpp

@@ -633,6 +633,39 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
         }
     }
 }
+    
+// add file.blob attrib_type for blob attribs in changed_values
+void CDBAdapter::updateAllBlobAttribChanges()
+    {
+        //Check for attrib = object
+        IDBResult res = executeSQL("SELECT object, source_id, attrib "
+                                   "FROM changed_values where update_type = 'update' and sent=0");
+        
+        if ( res.isEnd() )
+            return;
+        
+        startTransaction();
+        
+        Vector<String> arObj, arAttrib;
+        Vector<int> arSrcID;
+        for( ; !res.isEnd(); res.next() )
+        {
+            arObj.addElement(res.getStringByIdx(0));
+            arSrcID.addElement(res.getIntByIdx(1));
+            arAttrib.addElement(res.getStringByIdx(2));
+        }
+        
+        for( int i = 0; i < (int)arObj.size(); i++ )
+        {
+            String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), arAttrib.elementAt(i).c_str()) ? "blob.file" : "";
+            if (attribType.length() > 0) {
+                executeSQL("UPDATE changed_values SET attrib_type=? WHERE source_id=? and object=? and attrib=? and sent=0", attribType, arSrcID.elementAt(i), arObj.elementAt(i), arAttrib.elementAt(i));
+            }
+        }
+        
+        endTransaction();
+    }
+    
 
 void CDBAdapter::updateAllAttribChanges()
 {

data/platform/shared/db/DBAdapter.h

@@ -359,7 +359,12 @@ public:
 	
     DBResultPtr prepareStatement( const char* szSt );
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res, const char* szSt);
+
+    // unpack object in changed_values with update_type==create to set of objects's attribs
     void updateAllAttribChanges();
+    
+    // add file.blob attrib_type for blob attribs in changed_values
+    void updateAllBlobAttribChanges();
     void updateFullUpdateChanges(int nSrcID);
 
 	String exportDatabase();

data/platform/shared/logging/RhoLogConf.cpp

@@ -107,7 +107,8 @@ LogSettings::LogSettings()
     m_bLogToSocket = false;
 
     m_nMaxLogFileSize = 0; 
-    m_bLogPrefix = true; 
+    m_bLogPrefix = true;
+    m_bIsInitialized = false;
 
     m_strLogURL = "";
 
@@ -311,6 +312,7 @@ void LogSettings::loadFromConf(rho::common::RhoSettings& oRhoConf)
 		int milliseconds = oRhoConf.getInt("LogMemPeriod");
 		setCollectMemoryInfoInterval(milliseconds);
 	}
+    m_bIsInitialized = true;
 }
 
 void LogSettings::setLogFilePath(const String& logFilePath){
@@ -522,6 +524,14 @@ void rho_logconf_Init_with_separate_user_path(const char* szLogPath, const char*
     rho_conf_Init_with_separate_user_path(szRootPath, szUserPath);
 
     LOGCONF().loadFromConf(RHOCONF());
+
+    // print rhodes gem version
+    if (RHOCONF().isExist("rhodes_gem_version")) {
+        if (LOGCONF().getMinSeverity() < 2) {
+            String rho_gem_version = "RHODES_GEM_VERSION=" + RHOCONF().getString("rhodes_gem_version");
+            LOGCONF().sinkLogMessage(rho_gem_version);
+        }
+    }
 }
 
 void rho_logconf_Init(const char* szLogPath, const char* szRootPath, const char* szLogPort){
@@ -590,6 +600,12 @@ void rho_log_resetup_http_url(const char* http_log_url)
     //LOGCONF().reinitRemoteLog();
 }
 
+bool rho_log_system_is_ready() {
+    return LOGCONF().isReadyForLogging();
+}
+    
+    
+    
 #ifndef RHO_NO_RUBY
 VALUE rho_conf_get_property_by_name(char* name)
 {

data/platform/shared/logging/RhoLogConf.h

@@ -88,6 +88,8 @@ class LogSettings{
 	String      m_strLogURL;
 
     bool        m_bLogPrefix;
+    
+    bool        m_bIsInitialized;
 
     String      m_strEnabledCategories, m_strDisabledCategories;
     Vector<String>     m_arExcludeAttribs;
@@ -130,6 +132,8 @@ public:
 
     bool isLogPrefix()const{ return m_bLogPrefix;}
 	void setLogPrefix(bool bLogPrefix){ m_bLogPrefix = bLogPrefix; }
+    
+    bool isReadyForLogging() { return m_bIsInitialized;}
 
 	const String& getLogURL() const { return m_strLogURL; }
 	void setLogURL(const char* szLogURL);
@@ -218,6 +222,8 @@ int rho_conf_send_log_in_same_thread();
 void rho_conf_clean_log();
     
 void rho_log_resetup_http_url(const char* http_log_url);
+    
+bool rho_log_system_is_ready();
 
 #ifdef __cplusplus
 }