rhodes 2.0.0.beta7 → 2.0.0.beta8

data/platform/shared/net/AsyncHttp.h

@@ -4,60 +4,102 @@
 
 #include "net/INetRequest.h"
 #include "logging/RhoLog.h"
-#include "common/RhoThread.h"
-#include "common/IRhoClassFactory.h"
+#include "common/ThreadQueue.h"
 
 namespace rho
 {
 namespace net
 {
 
-class CAsyncHttp : public common::CRhoThread, rho::ICallbackObject
+class CAsyncHttp : public common::CThreadQueue 
 {
     DEFINE_LOGCLASS;
 
-    static common::CMutex m_mxInstances;
-    static VectorPtr<CAsyncHttp*> m_arInstances;
-    common::CAutoPtr<common::IRhoClassFactory> m_ptrFactory;
-    common::CMutex m_mxRequest;
+    class CAsyncHttpResponse : public rho::ICallbackObject
+    {
+        common::CAutoPtr<INetResponse> m_pNetResponse;
+        String m_strContentType;
+    public:
+        CAsyncHttpResponse(INetResponse* pResp, const String& strContentType)
+        {
+            m_pNetResponse = pResp;
+            m_strContentType = strContentType;
+        }
+        ~CAsyncHttpResponse();
 
-    common::CAutoPtr<INetRequest> m_pNetRequest;
-    common::CAutoPtr<INetResponse> m_pNetResponse;
-    Hashtable<String,String> m_mapHeaders;
+        virtual unsigned long getObjectValue();
+
+    };
 
-    String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
-    String m_strFilePath;
-	String m_strResBody;
-    boolean m_sslVerifyPeer;
-    boolean m_bFinished;
 public:
     enum EHttpCommands{ hcGet = 0, hcPost, hcDownload, hcUpload };
+
+    class CHttpCommand : public CQueueCommand
+    {
+    public:
+	    EHttpCommands m_eCmd;
+        String m_strUrl, m_strBody, m_strCallback, m_strCallbackParams;
+        String m_strFilePath;
+        boolean m_sslVerifyPeer;
+        Hashtable<String,String> m_mapHeaders;
+
+        common::CAutoPtr<INetRequest> m_pNetRequest;
+        String m_strResBody;
+
+        CHttpCommand(EHttpCommands eCmd,
+            const char* url, unsigned long headers, const char* body,
+            const char* file_path,
+            const char* callback, const char* callback_params, boolean ssl_verify_peer = true);
+
+        void execute();
+        void cancel();
+
+        void callNotify(INetResponse* pResp, int nError );
+        unsigned long getRetValue();
+
+	    boolean equals(const CQueueCommand& cmd){ return false; }
+
+        String toString()
+        {
+            switch(m_eCmd)
+            {
+            case hcGet:
+                return "GET";
+            case hcPost:
+                return "POST";
+            case hcDownload:
+                return "Download";
+            case hcUpload:
+                return "Upload";
+            }
+            return "Unknown";
+        }
+
+    private:
+        String makeHeadersString();
+
+    };
+
 private:
-    EHttpCommands m_eCmd;
-public:
+    static CAsyncHttp* m_pInstance;
 
-    static boolean m_bNoThreaded;
+    CHttpCommand* m_pCurCmd;
 
-    CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
-        const char* url, unsigned long headers, const char* body,
-        const char* file_path,
-        const char* callback, const char* callback_params, boolean ssl_verify_peer = true);
+public:
 
-    void cancel(boolean bWait);
+    static CAsyncHttp* Create();
+    static void Destroy();
+    static CAsyncHttp* getInstance(){ return m_pInstance; }
 
-    static void cancelRequest(const char* szCallback, boolean bWait);
+    void cancelRequest(const char* szCallback, boolean bWait);
 
-    //rho::ICallbackObject
-    virtual unsigned long getObjectValue();
+    virtual void addQueueCommand(CQueueCommand* pCmd);
 
-    unsigned long getRetValue();
 private:
-    virtual void run();
-
-    void callNotify(INetResponse& resp, int nError );
+    CAsyncHttp(common::IRhoClassFactory* factory);
+    ~CAsyncHttp();
 
-    String makeHeadersString();
-    static void addNewObject(CAsyncHttp* pObj);
+    virtual void processCommand(CQueueCommand* pCmd);
 };
 
 } // namespace net
@@ -74,7 +116,6 @@ unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const c
 unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* body, const char* filename, const char* callback, const char* callback_params, int ssl_verify_peer);
 void rho_asynchttp_cancel(const char* cancel_callback);
-void rho_asynchttp_destroy();
 
 #ifdef __cplusplus
 };

data/platform/shared/net/HttpServer.cpp

@@ -333,6 +333,8 @@ CHttpServer::callback_t CHttpServer::registered(String const &uri)
     return it->second;
 }
 
+extern "C" void rb_gc(void);
+
 bool CHttpServer::run()
 {
     if (m_listener == INVALID_SOCKET)
@@ -357,13 +359,17 @@ bool CHttpServer::run()
             return false;
         }
 
+        bool bProcessed = false;
         if (!m_bPause){
             RAWTRACE("Connection accepted, process it...");
-            process(conn);
+            bProcessed = process(conn);
         }
 
         RAWTRACE("Close connected socket");
         closesocket(conn);
+
+        if ( bProcessed )
+            rb_gc();
     }
     
     return true;

data/platform/shared/ruby/thread.c

@@ -47,6 +47,10 @@
 #include "eval_intern.h"
 #include "gc.h"
 
+//RHO
+#define USE_NATIVE_THREAD_PRIORITY  1
+//RHO
+
 #ifndef USE_NATIVE_THREAD_PRIORITY
 #define USE_NATIVE_THREAD_PRIORITY 0
 #define RUBY_THREAD_PRIORITY_MAX 3

data/platform/shared/ruby/thread_win32.c

@@ -190,10 +190,10 @@ typedef LPTHREAD_START_ROUTINE w32_thread_start_func;
 static HANDLE
 w32_create_thread(DWORD stack_size, w32_thread_start_func func, void *val)
 {
-    return start_thread(0, stack_size, func, val, CREATE_SUSPENDED
-#ifdef _WIN32_WCE
-        |STACK_SIZE_PARAM_IS_A_RESERVATION
-#endif
+    return start_thread(0, 0/*stack_size*/, func, val, CREATE_SUSPENDED
+//#ifdef _WIN32_WCE
+//        |STACK_SIZE_PARAM_IS_A_RESERVATION
+//#endif
         ,0);
 }
 
@@ -587,25 +587,26 @@ timer_thread_func(void *dummy)
 static void
 rb_thread_create_timer_thread(void)
 {
-    if (timer_thread_id == 0) {
+/*    if (timer_thread_id == 0) {
 	if (!timer_thread_lock) {
 	    timer_thread_lock = CreateEvent(0, TRUE, FALSE, 0);
 	}
 	timer_thread_id = w32_create_thread(1024 + (THREAD_DEBUG ? BUFSIZ : 0),
 					    timer_thread_func, 0);
 	w32_resume_thread(timer_thread_id);
-    }
+    }*/
 }
 
 static int
 native_stop_timer_thread(void)
 {
-    int stopped = --system_working <= 0;
+    return 1;
+/*    int stopped = --system_working <= 0;
     if (stopped) {
 	CloseHandle(timer_thread_lock);
 	timer_thread_lock = 0;
     }
-    return stopped;
+    return stopped;  */
 }
 
 #endif /* THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION */

data/platform/shared/rubyJVM/src/com/rho/RhodesApp.java

@@ -27,8 +27,6 @@ public class RhodesApp
     int m_currentTabIndex = 0;
     String[] m_currentUrls = new String[5];
     
-    NetRequest getNet() { return RhoClassFactory.createNetRequest();}
-    
     public static RhodesApp Create(String strRootPath)
     {
         if ( m_pInstance != null ) 
@@ -50,6 +48,9 @@ public class RhodesApp
     public String getDBDirPath(){return m_strDBDirPath; }
     public String getRhoRootPath(){return m_strRhoRootPath;}
     
+    NetRequest getNet() { return RhoClassFactory.createNetRequest();}
+    public String getHomeUrl(){ return m_strHomeUrl; }
+    
     RhodesApp(String strRootPath)
     {
         m_strRhoRootPath = strRootPath;
@@ -61,7 +62,7 @@ public class RhodesApp
 
     void initAppUrls() 
     {
-    	m_strHomeUrl = "http://localhost:8080";
+    	m_strHomeUrl = "http://localhost:2375";
         m_strBlobsDirPath = getRhoRootPath() + "db/db-files";
     	m_strDBDirPath = getRhoRootPath() + "db";
     }
@@ -104,9 +105,29 @@ public class RhodesApp
         return res;
     }
     
-    String canonicalizeRhoUrl(String strUrl)throws Exception 
+    boolean isExternalUrl(String strUrl)
+    {
+    	return strUrl.startsWith("http://") || strUrl.startsWith("https://") ||
+    		strUrl.startsWith("javascript:") || strUrl.startsWith("mailto:")
+    		 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:");    
+    }
+    
+    public String canonicalizeRhoUrl(String url) 
+    {
+		if ( url == null || url.length() == 0 )
+			return getHomeUrl();
+
+		String strUrl = new String(url);
+		strUrl.replace('\\', '/');
+		if ( !strUrl.startsWith(getHomeUrl()) && !isExternalUrl(strUrl) )
+			strUrl = FilePath.join(getHomeUrl(), strUrl);
+		
+		return strUrl;
+    }
+    
+    public boolean isRhodesAppUrl(String url)
     {
-    	return getNet().resolveUrl(strUrl);    	
+    	return url.startsWith(getHomeUrl()); 
     }
     
     public void setPushNotification(String strUrl, String strParams )throws Exception

data/platform/shared/rubyJVM/src/com/rho/net/INetworkAccess.java

@@ -8,6 +8,4 @@ public interface INetworkAccess {
 	public abstract IHttpConnection connect(String server, boolean ignoreSuffixOnSim) throws IOException;
 	public abstract void close();
 	public abstract long getMaxPacketSize();
-	
-	public abstract String getHomeUrl();
 }

data/platform/shared/rubyJVM/src/com/rho/net/NetRequest.java

@@ -13,6 +13,7 @@ import com.rho.IRhoRubyHelper;
 import com.rho.RhoConf;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
+import com.rho.RhodesApp;
 import com.rho.file.*;
 
 import java.util.Enumeration;
@@ -225,7 +226,7 @@ public class NetRequest
     {
 		m_bCancel = false;
 		
-		if ( URI.isLocalHost(strUrl) )
+		if ( RhodesApp.getInstance().isRhodesAppUrl(strUrl) )
 		{
 			IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
 			return helper.postUrl(strUrl,strBody);
@@ -594,19 +595,9 @@ public class NetRequest
 		return false;
 	}
 	
-	public String resolveUrl(String url) throws Exception
+	public String resolveUrl(String strUrl) throws Exception
     {
-		if ( url == null || url.length() == 0 )
-			return "";
-
-		String _httpRoot = RhoClassFactory.getNetworkAccess().getHomeUrl();
-		if(!_httpRoot.endsWith("/"))
-			_httpRoot = _httpRoot + "/";
-		url.replace('\\', '/');
-		if ( !url.startsWith(_httpRoot) )
-			url = FilePath.join(_httpRoot, url);
-		
-		return url;
+	    return RhodesApp.getInstance().canonicalizeRhoUrl(strUrl);
     }
 
 	public void cancel()

data/platform/shared/rubyJVM/src/com/rho/net/URI.java

@@ -1219,12 +1219,12 @@ import com.rho.Tokenizer;
 	  
 	  return sb.toString();
   }
-  
+/*  
   public static boolean isLocalHost(String strUrl)
   {
 	  return strUrl.startsWith("http://localhost") ||
 	  	strUrl.startsWith("http://127.0.0.1");
-  }
+  }*/
 
   public static boolean isLocalData(String strUrl)
   {

data/platform/shared/rubyJVM/src/com/rho/sync/SyncEngine.java

@@ -475,10 +475,10 @@ public class SyncEngine implements NetRequest.IRhoSession
 	{
 	    if ( strSources.length() > 0 )
 	    {
-	        NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
+	        /*NetResponse resp = getNet().pushData( getNet().resolveUrl("/system/loadserversources"), strSources, null);
 	        loadAllSources();
 	        
-	        DBAdapter.initAttrManager();
+	        DBAdapter.initAttrManager();*/
 	    }
 	}
 	
@@ -521,7 +521,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	
 	        JSONEntry oJsonEntry = new JSONEntry(szData);
 	
-	        if (oJsonEntry.hasName("server_sources") )
+	        if (oJsonEntry.hasName("sources") )
 	            processServerSources(szData);
 	        
 	        JSONEntry oJsonObject = oJsonEntry.getEntry("client");

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/ObjectFactory.java

@@ -13,6 +13,7 @@ import com.xruby.runtime.lang.RubyMethod;
 import com.xruby.runtime.lang.RubyRuntime;
 import com.xruby.runtime.lang.RubySymbol;
 import com.xruby.runtime.lang.RubyValue;
+import java.util.Hashtable;
 
 import j2me.math.HugeInt;
 import org.apache.oro.text.regex.MatchResult;
@@ -83,8 +84,17 @@ public class ObjectFactory {
         return new RubyString(c, s);
     }
 
-    public static RubyRegexp createRegexp(String value, String option) {
-        return new RubyRegexp(value, option);
+    private static Hashtable m_hashRegex = new Hashtable(); 
+    public static synchronized RubyRegexp createRegexp(String value, String option) 
+    {
+    	String strKey = value+option;
+    	Object obj = m_hashRegex.get(strKey);
+    	if ( obj == null )
+    	{
+    		obj = new RubyRegexp(value, option);
+    		m_hashRegex.put(strKey, obj);
+    	}
+        return (RubyRegexp)obj;
     }
 
     public static RubyRegexp createRegexp() {

data/platform/shared/rubyJVM/src/com/xruby/runtime/builtin/RubyString.java

@@ -126,23 +126,26 @@ public class RubyString extends RubyBasic {
     public RubyString appendString(RubyValue v) {
         if (v instanceof RubyString) {
             return appendString((RubyString)v);
-        } else {
+        } else if (v!=null){
             RubyValue r = RubyAPI.callPublicNoArgMethod(v, null, RubyID.toSID);
             if ( r instanceof RubyString )
             	return appendString((RubyString)r);
             
             return ObjectFactory.createString(r.toString());
         }
+        
+       	return this;
     }
 
     public int appendString2(RubyValue v) {
     	RubyString str = null;
         if (v instanceof RubyString) {
             str = (RubyString)v;
-        } else {
+        } else  if (v!=null){
             RubyValue r = RubyAPI.callPublicNoArgMethod(v, null, RubyID.toSID);
             str = (RubyString)r;
-        }
+        }else
+        	str = ObjectFactory.createString("");
         
         appendString(str);
         

data/platform/shared/rubyJVM/src/javolution/util/FastTable.java

@@ -534,7 +534,16 @@ public class FastTable/*<E>*/extends FastCollection/*<E>*/implements
         if ((fromIndex < 0) || (toIndex > _size) || (fromIndex > toIndex))
             throw new IndexOutOfBoundsException("fromIndex: " + fromIndex
                     + ", toIndex: " + toIndex + " for list of size: " + _size);
-        return SubTable.valueOf(this, fromIndex, toIndex - fromIndex);
+        int size = toIndex - fromIndex;
+        FastTable table = new FastTable(size);
+        
+        for( int i = fromIndex; i < size; i++ )
+        	table.add(this.get(i));
+        	
+        return table;
+//RHO    
+        //return SubTable.valueOf(this, fromIndex, toIndex - fromIndex);
+//RHO        
     }
 
     /**
@@ -714,6 +723,7 @@ public class FastTable/*<E>*/extends FastCollection/*<E>*/implements
     /**
      * This inner class implements a sub-table.
      */
+/*    
     private static final class SubTable extends FastCollection implements List,
             RandomAccess {
 
@@ -830,7 +840,7 @@ public class FastTable/*<E>*/extends FastCollection/*<E>*/implements
             return SubTable.valueOf(_table, _offset + fromIndex, toIndex
                     - fromIndex);
         }
-    }
+    }*/
 
     /**
      * This inner class implements a fast table iterator.