transactd 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee3cdfaa3f792fa78bdd768a1e1bd59aab2d397
-  data.tar.gz: b3bdc6c8537f1702937fec029a738741acf7ce36
+  metadata.gz: 7f89d3c2a7bda1a1c1acbe8113106f860cac1ede
+  data.tar.gz: 33eb8baabb33c8915a9fc68dd5bb8cf4b3198d76
 SHA512:
-  metadata.gz: d9c9fd281de6502256b7c224c4e1a5ea0f76feec5c3e3835c18f80d90154d2e94ed178deffc408c9af08f404e221518adf8b639a7035a6694a3870e1c46e1aa1
-  data.tar.gz: af652139f6b992ae9bd0785633f617a6720d104b1559fce4ee94519a4d35da99490b01ece82e695cf6e1b212ba70b013a6018b3f579e865bd19ffed82e30e58f
+  metadata.gz: 1341f50aaae62539ab3844a0658836f516ea75f47d48879e78e34f795f12fa41743a580ec1b54d4c93fb8408729d44f770514a1aee17fe2cf0b0a73058317123
+  data.tar.gz: 8ca6b44afd9d429e98c673a32982b0a759c1a2ab304029778262c5729ffdbf0bb7311f18d86b5ee5df29b6d2baac4a1841d0fdfaf679fa45b1ea2a3a4a7c53dc

data/README

@@ -258,7 +258,7 @@ to drop a database.
 mysql>drop database test;
 ```
 
-If `-- showprogress=yes` is passed, it shows progress like:
+If `-- show_progress=yes` is passed, it shows progress like:
  ```
 0%   10   20   30   40   50   60   70   80   90   100%
 |----|----|----|----|----|----|----|----|----|----|

data/README-JA

@@ -266,7 +266,7 @@ mysql>drop database test;
 ```
 を実行しデータベースを事前に削除してください。
 
-コマンドライン引数に `--showprogress=yes` を追加すると下記のように実行状況をプロ
+コマンドライン引数に `--show_progress=yes` を追加すると下記のように実行状況をプロ
 グレス表示します。
 ```
 0%   10   20   30   40   50   60   70   80   90   100%

data/build/common/transactd_common.cmake

@@ -208,8 +208,12 @@ macro(transactd_link_boost_libraries boost_components)
     if(MINGW)
       target_link_libraries(${this_target} ${Boost_LIBRARIES})
     else()
-      # need "-lrt" after chrono or timer
-      target_link_libraries(${this_target} ${Boost_LIBRARIES} rt)
+      if(APPLE)
+        target_link_libraries(${this_target} ${Boost_LIBRARIES})
+      else()
+        # need "-lrt" after chrono or timer
+        target_link_libraries(${this_target} ${Boost_LIBRARIES} rt)
+      endif()
     endif()
   endif()
   ## find Boost for Visual Studio /MD or /MDd or /MT or /MTd

data/build/tdclc/CMakeLists.txt

@@ -67,6 +67,12 @@ set(${this_target}_SOURCE_FILES
   ${TRANSACTD_ROOT}/source/bzs/netsvc/client/tcpClient.cpp
   ${TRANSACTD_ROOT}/source/bzs/rtl/stl_uty.cpp
 )
+if(APPLE)
+  set(${this_target}_SOURCE_FILES ${${this_target}_SOURCE_FILES}
+    ${TRANSACTD_ROOT}/source/bzs/env/crosscompile.cpp
+    ${TRANSACTD_ROOT}/source/bzs/env/mbcswchrLinux.cpp
+  )
+endif()
 
 
 # ==========================================================
@@ -129,6 +135,9 @@ add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
 # add link / include
 # ==========================================================
 transactd_link_boost_libraries("filesystem;system;thread")
+if(APPLE)
+  target_link_libraries(${this_target} iconv)
+endif()
 
 
 # ==========================================================

data/build/tdclc/tdclc_32.cbproj

@@ -26,9 +26,7 @@
     <PropertyGroup Condition="'$(Base)'!=''">
         <Defines>BOOST_ALL_NO_LIB;TRANSACTD;$(Defines)</Defines>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
-        <BRCC_Defines>__BCPLUSPLUS__;$(BRCC_Defines)</BRCC_Defines>
-        <VerInfo_DLL>true</VerInfo_DLL>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
         <DllSuffix>_1_0</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
@@ -38,10 +36,7 @@
         <Manifest_File>None</Manifest_File>
         <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Locale>1041</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <OutputExt>dll</OutputExt>
-        <PackageImports>vcl.bpi;rtl.bpi</PackageImports>
         <Multithreaded>true</Multithreaded>
         <NoVCL>true</NoVCL>
         <ProjectType>VCppStyleDll</ProjectType>
@@ -77,7 +72,7 @@
     </PropertyGroup>
     <ItemGroup>
         <ResourceCompile Include="tdclc.rc">
-             <Form>tdclcpp.res</Form>
+             <Form>tdclc.res</Form>
              <BuildOrder>20</BuildOrder>
         </ResourceCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\client.cpp">
@@ -114,9 +109,6 @@
             <DependentOn>..\..\netsvc\client\tcpClient.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <CppCompile Include="..\..\source\bzs\rtl\datetime.cpp">
-            <BuildOrder>13</BuildOrder>
-        </CppCompile>
         <CppCompile Include="..\..\source\bzs\rtl\stl_uty.cpp">
             <BuildOrder>9</BuildOrder>
         </CppCompile>

data/build/tdclc/tdclc_64.cbproj

@@ -43,9 +43,7 @@
     <PropertyGroup Condition="'$(Base)'!=''">
         <Defines>BOOST_ALL_NO_LIB;TRANSACTD;$(Defines)</Defines>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
-        <BRCC_Defines>__BCPLUSPLUS__;$(BRCC_Defines)</BRCC_Defines>
-        <VerInfo_DLL>true</VerInfo_DLL>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+        <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
         <DllSuffix>_1_0</DllSuffix>
         <DynamicRTL>false</DynamicRTL>
         <BPILibOutputDir>..\..\lib</BPILibOutputDir>
@@ -55,8 +53,6 @@
         <Manifest_File>None</Manifest_File>
         <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Locale>1041</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
         <OutputExt>dll</OutputExt>
         <PackageImports>vcl.bpi;rtl.bpi</PackageImports>
         <Multithreaded>true</Multithreaded>
@@ -101,7 +97,7 @@
     </PropertyGroup>
     <ItemGroup>
         <ResourceCompile Include="tdclc.rc">
-             <Form>tdclcpp.res</Form>
+             <Form>tdclc.res</Form>
              <BuildOrder>20</BuildOrder>
         </ResourceCompile>
         <CppCompile Include="..\..\source\bzs\db\protocol\tdap\client\client.cpp">
@@ -138,9 +134,6 @@
             <DependentOn>..\..\netsvc\client\tcpClient.h</DependentOn>
             <BuildOrder>2</BuildOrder>
         </CppCompile>
-        <CppCompile Include="..\..\source\bzs\rtl\datetime.cpp">
-            <BuildOrder>13</BuildOrder>
-        </CppCompile>
         <CppCompile Include="..\..\source\bzs\rtl\stl_uty.cpp">
             <BuildOrder>9</BuildOrder>
         </CppCompile>

data/build/tdclcpp/tdclcpp_bcb_32.cbproj

@@ -36,15 +36,12 @@
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<BRCC_EnableMultiByte>true</BRCC_EnableMultiByte>
 			<BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
-			<BRCC_Defines>__BCPLUSPLUS__;$(BRCC_Defines)</BRCC_Defines>
+			<BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
 			<Defines>ARBTREGN_PKG;BOOST_ALL_NO_LIB;$(Defines)</Defines>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-			<VerInfo_Keys>CompanyName=BizStation Corp;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=Copy right (C) 2013 BizStation Corp;LegalTrademarks=;OriginalFilename=;ProductName=Transactd Client;ProductVersion=1.1.0.0;Comments=</VerInfo_Keys>
-			<VerInfo_MinorVer>1</VerInfo_MinorVer>
-			<VerInfo_DLL>true</VerInfo_DLL>
 			<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_Locale>1041</VerInfo_Locale>
 			<BCC_wiip>false</BCC_wiip>
+			<BCC_wpch>false</BCC_wpch>
+			<BCC_wpar>false</BCC_wpar>
 			<Multithreaded>true</Multithreaded>
 			<ILINK_LibraryPath>..\..\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
 			<ProjectType>CppDynamicLibrary</ProjectType>
@@ -59,7 +56,6 @@
 			<UsePackages>false</UsePackages>
 			<IntermediateOutputDir>.\$(Config)\$(Platform)</IntermediateOutputDir>
 			<FinalOutputDir>..\..\bin\</FinalOutputDir>
-			<BCC_wpar>false</BCC_wpar>
 			<BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
 			<BCC_ExtendedErrorInfo>true</BCC_ExtendedErrorInfo>
 			<TD_VER_MAJOR>1</TD_VER_MAJOR>

data/build/tdclcpp/tdclcpp_bcb_64.cbproj

@@ -64,16 +64,12 @@
     <PropertyGroup Condition="'$(Base)'!=''">
         <ILINK_LibraryPath>..\..\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
         <BRCC_CompilerToUse>rc</BRCC_CompilerToUse>
-        <BRCC_Defines>__BCPLUSPLUS__;$(BRCC_Defines)</BRCC_Defines>
+        <BRCC_IncludePath>$(BDSINCLUDE)\windows\sdk;$(BRCC_IncludePath)</BRCC_IncludePath>
         <BRCC_EnableMultiByte>true</BRCC_EnableMultiByte>
-        <VerInfo_MinorVer>1</VerInfo_MinorVer>
-        <VerInfo_DLL>true</VerInfo_DLL>
         <Defines>ARBTREGN_PKG;$(Defines)</Defines>
         <IncludePath>..\..\source\;$(IncludePath)</IncludePath>
         <Manifest_File>None</Manifest_File>
         <ILINK_AdditionalOptions>/Gl</ILINK_AdditionalOptions>
-        <VerInfo_Keys>CompanyName=BizStation Corp;FileDescription=;FileVersion=1.1.0.0;InternalName=;LegalCopyright=Copyright(C) 2013 BizStation Corp;LegalTrademarks=;OriginalFilename=;ProductName=Transactd Client;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
-        <VerInfo_Locale>1041</VerInfo_Locale>
         <DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
         <BCC_wiip>false</BCC_wiip>
         <TD_VER_MAJOR>1</TD_VER_MAJOR>
@@ -100,14 +96,10 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <Manifest_File>None</Manifest_File>
-        <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <_TCHARMapping>char</_TCHARMapping>
@@ -136,8 +128,6 @@
         <TASM_Debugging>None</TASM_Debugging>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-        <VerInfo_Locale>1033</VerInfo_Locale>
         <Defines>NDEBUG;$(Defines)</Defines>
         <DllSuffix>m_$(DllSuffix)</DllSuffix>
     </PropertyGroup>
@@ -149,9 +139,7 @@
         <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
         <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
         <ILINK_Verbose>true</ILINK_Verbose>
-        <VerInfo_Locale>1033</VerInfo_Locale>
         <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DllSuffix>u_$(DllSuffix)</DllSuffix>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_4)'!=''">
@@ -162,8 +150,6 @@
         <BCC_WindowsVersionDefines>NTDDI_VERSION=NTDDI_WINXPSP1;_WIN32_WINNT=_WIN32_WINNT_WINXP</BCC_WindowsVersionDefines>
         <BCC_OptimizeForSize>true</BCC_OptimizeForSize>
         <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-        <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <DllSuffix>u_$(DllSuffix)</DllSuffix>
     </PropertyGroup>
     <ItemGroup>

data/build/tdclrb/CMakeLists.txt

@@ -167,8 +167,12 @@ endif()
 # ==========================================================
 # add_library
 # ==========================================================
-add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
-
+if(APPLE)
+  add_library(${this_target} MODULE ${${this_target}_SOURCE_FILES})
+  set_target_properties(${this_target} PROPERTIES LINK_FLAGS "-flat_namespace")
+else()
+  add_library(${this_target} SHARED ${${this_target}_SOURCE_FILES})
+endif()
 
 # ==========================================================
 # add link / include
@@ -187,8 +191,12 @@ target_link_libraries(${this_target} ${TRANSACTD_RUBY_LIBRARY_PATH})
 # ==========================================================
 set_target_properties(${this_target} PROPERTIES PREFIX "")
 set_target_properties(${this_target} PROPERTIES OUTPUT_NAME transactd)
-set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
-if(UNIX)
+if(APPLE)
+  set_target_properties(${this_target} PROPERTIES SUFFIX ".bundle")
+else()
+  set_target_properties(${this_target} PROPERTIES SUFFIX ".so")
+endif()
+if(UNIX AND NOT APPLE)
   set_target_properties(${this_target} PROPERTIES
     SOVERSION ${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}
     VERSION ${TDVER_RUBYGEM_MAJOR}.${TDVER_RUBYGEM_MINOR}.${TDVER_RUBYGEM_RELEASE})

data/build/tdclrb/GEM_VERSION

@@ -1,3 +1,3 @@
 TDVER_RUBYGEM_VER_MAJOR   1
-TDVER_RUBYGEM_VER_MINOR   0
-TDVER_RUBYGEM_VER_RELEASE 1
+TDVER_RUBYGEM_VER_MINOR   1
+TDVER_RUBYGEM_VER_RELEASE 2

data/source/bzs/db/engine/mysql/mysqlThd.cpp

@@ -27,15 +27,16 @@ extern unsigned int g_lock_wait_timeout;
 extern char* g_transaction_isolation;
 
 #ifdef USETLS
-DWORD g_tlsiID = 0;
+tls_key g_tlsiID ;
+#else
+__THREAD char* __THREAD_BCB t_stack = NULL;
 #endif
 
-__THREAD char* __THREAD_BCB t_stack = NULL;
 
 inline char* getStackaddr()
 {
 #ifdef USETLS
-	return (char*)TlsGetValue(g_tlsiID);
+	return (char*)tls_getspecific(g_tlsiID);
 #else
 	return t_stack;
 #endif	
@@ -44,7 +45,7 @@ inline char* getStackaddr()
 inline void setStackaddr(char* v)
 {
 #ifdef USETLS
-	TlsSetValue(g_tlsiID, v);
+	tls_setspecific(g_tlsiID, v);
 #else
 	t_stack = v;
 #endif

data/source/bzs/db/engine/mysql/mysqlThd.h

@@ -28,7 +28,7 @@ THD* createThdForThread();
 void deleteThdForThread(THD* thd);
 void endThread();
 
-#ifdef _WIN32
+#if (defined(_WIN32) || defined(__APPLE__))
 #define USETLS
 #endif
 

data/source/bzs/db/protocol/tdap/btrDate.cpp

@@ -31,17 +31,28 @@
 
 #pragma package(smart_init)
 
+#undef USETLS
+#if ((defined(_WIN32) && _MSC_VER) || __APPLE__)
+#define USETLS
+#endif
+
 
-#if (defined(_WIN32) && _MSC_VER)
-	extern DWORD g_tlsiID_SC2;
+#ifdef USETLS
+	extern tls_key g_tlsiID_SC2;
 #else
 	__THREAD _TCHAR __THREAD_BCB g_date2[45];
 #endif
 
 inline _TCHAR* databuf()
 {
-	#if (defined(_WIN32) && _MSC_VER)
-		return (_TCHAR*)TlsGetValue(g_tlsiID_SC2);
+	#ifdef USETLS
+		_TCHAR* p = (_TCHAR*)tls_getspecific(g_tlsiID_SC2);
+		if (p == NULL)
+		{
+			p = (_TCHAR*)new wchar_t[45];
+			tls_setspecific(g_tlsiID_SC2, p);
+		}
+		return p; 
 	#else
 		return g_date2;
 	#endif

data/source/bzs/db/protocol/tdap/client/client.cpp

@@ -36,8 +36,8 @@ namespace tdap
 namespace client
 {
 
-#if( defined(_WIN32) && defined(_MSC_VER))
-DWORD g_tlsiID = 0;
+#ifdef USETLS
+tls_key g_tlsiID;
 #else
 __THREAD client* __THREAD_BCB g_client=NULL;
 #endif

data/source/bzs/db/protocol/tdap/client/client.h

@@ -31,7 +31,10 @@
 #include <vector>
 #ifdef _WIN32
 #include <mbstring.h>
+#else
+#include <pthread.h> 
 #endif
+
 extern bzs::netsvc::client::connections* m_cons;
 
 namespace bzs
@@ -46,7 +49,8 @@ namespace client
 {
 #define TABELNAME_PREFIX "dbfile="
 
-
+class client;
+void setClientThread(client* v);
 
 class client
 {
@@ -60,11 +64,10 @@ class client
 	std::string m_sql;
 	std::string m_serverCharData;
 	std::string m_serverCharData2;
-
 	uint_td m_tmplen;
 	bool m_logout;
 	blobBuffer m_blobBuffer;
-
+	bool m_disconnected;
 
 	std::vector<char> m_sendbuf;
 	inline bzs::netsvc::client::connection* con(){return m_req.cid->con;};
@@ -72,7 +75,10 @@ class client
 	
 	inline void disconnect()
 	{
-		m_req.result = !m_cons->disconnect(con());
+		if (!con())
+			m_req.result = 1;
+		else
+			m_disconnected = m_cons->disconnect(con());
 		if (m_req.result==0)
 			setCon(NULL);
 	}
@@ -106,8 +112,13 @@ class client
 	}
 	static void addSecondCharsetData(unsigned int destCodePage, std::string& src);
 public:
-	client():m_charsetIndexServer(-1)
+	client():m_charsetIndexServer(-1),m_disconnected(true)
+	{
+	}
+	void cleanup()
 	{
+		if (m_disconnected)
+			setClientThread(NULL);
 	}
 	request& req(){return m_req;}
 	inline void setParam(ushort_td op, posblk*   pbk,
@@ -136,9 +147,8 @@ public:
 	{
 		if (m_op==TD_STOP_ENGINE)
 		{
-			m_req.result = !m_cons->disconnect(con());
-			if (m_req.result==0)
-				setCon(NULL);
+			m_req.result = 0;
+			disconnect();
 			return !m_req.result;
 		}
 		return false;
@@ -153,7 +163,7 @@ public:
 			setCon(m_cons->connect(host));  //if error throw exception
 
 		}
-
+		m_disconnected = !m_req.cid->con;
 	}
 	inline void create()
 	{
@@ -176,7 +186,6 @@ public:
 		}else if ((m_req.keyNum == CR_SUBOP_SWAPNAME)||(m_req.keyNum == CR_SUBOP_RENAME))
 		{
 			readServerCharsetIndex();
-			//m_sql = std::string((char*)m_req.data, *m_req.datalen);
 			m_sql = (char*)m_req.data;
 			addSecondCharsetData(mysql::codePage(m_charsetIndexServer), m_sql);
 			m_req.data =(ushort_td*) m_sql.c_str();
@@ -211,7 +220,6 @@ public:
 	{
 		if (result()==0)
 		{
-			//mutex::scoped_lock lck(m_mutex);
 			if (!con())
 				m_preResult = ERROR_TD_NOT_CONNECTED;
 			else
@@ -257,27 +265,47 @@ public:
 	
 };
 
-#ifndef _MSC_VER
-extern __THREAD client* __THREAD_BCB g_client;
+#define USETLS //USE TLS ALL
+
+
+
+#ifdef USETLS
+extern tls_key g_tlsiID;
 #else
-extern DWORD g_tlsiID;
+extern __THREAD client* __THREAD_BCB g_client;
 #endif
 
 
+
 inline client* getClientThread()
 {
-#ifdef _MSC_VER
-	return (client*)TlsGetValue(g_tlsiID);
+#ifdef USETLS
+	client* p = (client*)tls_getspecific(g_tlsiID);
+	if (p == NULL)
+	{
+		p = new client();
+		tls_setspecific(g_tlsiID, p);
+	}
+	return p;
 #else
+	if (g_client == NULL)
+		g_client = new client();
 	return g_client;
 #endif	
 }
 
 inline void setClientThread(client* v)
 {
-#ifdef _MSC_VER
-	TlsSetValue(g_tlsiID, v);
+#ifdef USETLS
+	if (v == NULL)
+	{
+		client* p = (client*)tls_getspecific(g_tlsiID);
+		delete p;
+	}
+	tls_setspecific(g_tlsiID, v);
 #else
+	if (v == NULL)
+		delete g_client;
 	g_client = v;
 #endif
 }

data/source/bzs/db/protocol/tdap/client/databaseFactory.cpp

@@ -20,7 +20,7 @@
 #pragma hdrstop
 
 #include "database.h"
-
+#include <bzs/rtl/exception.h>
 //---------------------------------------------------------------------------
 
 
@@ -40,7 +40,12 @@ namespace client
 
 database* database::create()
 {
-    return new database();
+    try
+	{
+		return new database();
+	}
+	catch( bzs::rtl::exception& /*e*/){}
+	return NULL;
 }
 
 }//namespace client
@@ -49,23 +54,59 @@ database* database::create()
 }//namespace db
 }//namespace bzs
 
+
+#undef USETLS
+#if ((defined(_WIN32) && _MSC_VER) || __APPLE__)
+#define USETLS
+#endif
+
 /* At MSVC use __thread before Windows Vista,  After the DLL is loaded with LoadLibrary
    then  it causes system failure.
   
 */
-#if (defined(_WIN32) && _MSC_VER)
-DWORD g_tlsiID_SC1 = 0;
-DWORD g_tlsiID_SC2 = 0;
-DWORD g_tlsiID_SC3 = 0;
+#ifdef USETLS
+tls_key g_tlsiID_SC1;
+tls_key g_tlsiID_SC2;
+tls_key g_tlsiID_SC3;
 
 void initTlsThread()
 {
-	TlsSetValue(g_tlsiID_SC1, new wchar_t[256]);
+	tls_setspecific(g_tlsiID_SC1, new wchar_t[256]);
+	tls_setspecific(g_tlsiID_SC2, new wchar_t[45]);
+	tls_setspecific(g_tlsiID_SC3, new wchar_t[45]);
+}
 
-	TlsSetValue(g_tlsiID_SC2, new wchar_t[45]);
-	TlsSetValue(g_tlsiID_SC3, new wchar_t[45]);
+void cleanupTls()
+{
+     delete (char*)tls_getspecific(g_tlsiID_SC1);
+	 delete (char*)tls_getspecific(g_tlsiID_SC2);
+	 delete (char*)tls_getspecific(g_tlsiID_SC3);
 }
 
+#ifdef __APPLE__
+
+void __attribute__ ((constructor)) onLoadLibrary(void);
+void __attribute__ ((destructor)) onUnloadLibrary(void);
+
+void onLoadLibrary(void)
+{
+     pthread_key_create(&g_tlsiID_SC1, NULL);
+	 pthread_key_create(&g_tlsiID_SC2, NULL);
+	 pthread_key_create(&g_tlsiID_SC3, NULL);
+}
+
+void onUnloadLibrary(void)
+{
+	 cleanupTls();
+	 pthread_key_delete(g_tlsiID_SC1); 
+	 pthread_key_delete(g_tlsiID_SC2); 
+	 pthread_key_delete(g_tlsiID_SC3); 
+}
+
+
+
+#else
+
 BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 {
 	if (reason == DLL_PROCESS_ATTACH)
@@ -77,7 +118,6 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 		if ((g_tlsiID_SC3 = TlsAlloc()) == TLS_OUT_OF_INDEXES)
 			return FALSE;
 		initTlsThread();
-		
 	}
 	else if(reason == DLL_THREAD_ATTACH)
 	{
@@ -85,16 +125,18 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD  reason, LPVOID lpReserved)
 	}
 	else if(reason == DLL_THREAD_DETACH)
 	{
-
+		cleanupTls();
 	}
 	else if (reason == DLL_PROCESS_DETACH)
 	{
+		cleanupTls();
 		TlsFree(g_tlsiID_SC1);
 		TlsFree(g_tlsiID_SC2);
 		TlsFree(g_tlsiID_SC3);
 	}
 	return TRUE;
 }
+#endif
 #endif //(_UNICODE && defined(_WIN32) && _MSC_VER)