transactd 2.4.3 → 2.4.4

data/build/swig/tdcl.i

@@ -359,6 +359,7 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::dbdef::pushBackup;
 %ignore bzs::db::protocol::tdap::client::dbdef::relateData;
 %ignore bzs::db::protocol::tdap::client::dbdef::setStat;
+%ignore bzs::db::protocol::tdap::client::dbdef::tdapErr;
 
 // * bzs/db/protocol/tdap/client/field.h *
 %ignore bzs::db::protocol::tdap::client::compBlob;
@@ -585,6 +586,8 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::getTrnsctdEntryPoint;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::getBtrvEntryPoint;
 %ignore bzs::db::protocol::tdap::client::nsdatabase::setBtrvEntryPoint;
+%ignore bzs::db::protocol::tdap::client::nsdatabase::tdapErr;
+
 
 // * bzs/db/protocol/tdap/client/nsTable.h *
 %ignore bzs::db::protocol::tdap::client::nstable::buflen;
@@ -595,7 +598,9 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::nstable::tdap;
 %ignore bzs::db::protocol::tdap::client::nstable::test;
 %ignore bzs::db::protocol::tdap::client::nstable::throwError;
-%rename(tdapLastErr) bzs::db::protocol::tdap::client::nstable::tdapErr(HWND, _TCHAR*);
+%ignore bzs::db::protocol::tdap::client::nstable::tdapErr(HWND hWnd, _TCHAR* retbuf=NULL);
+%ignore bzs::db::protocol::tdap::client::nstable::tdapErr(HWND hWnd, short_td status, const _TCHAR* tableName = NULL, _TCHAR* retbuf = NULL);
+
 
 // * bzs/db/protocol/tdap/client/pooledDatabaseManager.h *
 %ignore bzs::db::protocol::tdap::client::xaTransaction;
@@ -751,21 +756,21 @@ using namespace bzs::db::protocol::tdap::client;
 %ignore bzs::db::protocol::tdap::client::filterdIterator::operator==;
 %ignore bzs::db::protocol::tdap::client::filterdIterator::operator!=;
 %ignore bzs::db::protocol::tdap::client::filterdIterator::operator*;
-%ignore bzs::db::protocol::tdap::client::filterdIterator::operator->;
-%ignore bzs::db::protocol::tdap::client::find;
-%ignore bzs::db::protocol::tdap::client::findRv;
-%ignore bzs::db::protocol::tdap::client::for_each;
-%ignore bzs::db::protocol::tdap::client::getFindIterator;
+//%ignore bzs::db::protocol::tdap::client::filterdIterator::operator->;
+//%ignore bzs::db::protocol::tdap::client::find;
+//%ignore bzs::db::protocol::tdap::client::findRv;
+//%ignore bzs::db::protocol::tdap::client::for_each;
+//%ignore bzs::db::protocol::tdap::client::getFindIterator;
 %ignore bzs::db::protocol::tdap::client::getTable;
 %ignore bzs::db::protocol::tdap::client::insertField;
 %ignore bzs::db::protocol::tdap::client::insertKey;
 %ignore bzs::db::protocol::tdap::client::insertRecord;
 %ignore bzs::db::protocol::tdap::client::insertTable;
-%ignore bzs::db::protocol::tdap::client::deleteTable
-%ignore bzs::db::protocol::tdap::client::renumberTable
-%ignore bzs::db::protocol::tdap::client::deleteField
-%ignore bzs::db::protocol::tdap::client::deleteKey
-%ignore bzs::db::protocol::tdap::client::validateTableDef
+//%ignore bzs::db::protocol::tdap::client::deleteTable
+//%ignore bzs::db::protocol::tdap::client::renumberTable
+//%ignore bzs::db::protocol::tdap::client::deleteField
+//%ignore bzs::db::protocol::tdap::client::deleteKey
+//%ignore bzs::db::protocol::tdap::client::validateTableDef
 %ignore bzs::db::protocol::tdap::client::isSameUri;
 %ignore bzs::db::protocol::tdap::client::lexical_cast;
 %ignore bzs::db::protocol::tdap::client::openDatabase;
@@ -1043,19 +1048,78 @@ using namespace bzs::db::protocol::tdap::client;
 #undef pragma_pop
 #define pragma_pop
 %include bzs/db/protocol/tdap/tdapcapi.h
+
+// -- typemap for tabledef::toChar
+%typemap(in, numinputs=0) (char* buf, const char* s, int size)
+{
+  int n = 0;
+  if (s) n = strlen(s)*2;
+  $3 = n;
+  if (n) $1 = new char[n];
+}
+%typemap(freearg) (char* buf, const char* s, int size)
+{
+  delete [] $1;
+}
 %include bzs/db/protocol/tdap/tdapSchema.h
+%clear char* buf, const char* s, int size;
+// --
+
+// -- typemap for nstable::getFilename, getDirUri, statMsg
+%typemap(in, numinputs=0) (_TCHAR* retbuf)
+{
+  _TCHAR tmpbuf[1024];
+  $1=tmpbuf; 
+}
 %include bzs/db/protocol/tdap/client/nsTable.h
+%clear char * retbuf;
+// --
+
+
+
+// -- typemap for dbdef::statMsg
+%typemap(in, numinputs=0) (_TCHAR* retbuf)
+{
+  _TCHAR tmpbuf[1024];
+  $1=tmpbuf; 
+}
 %include bzs/db/protocol/tdap/client/dbDef.h
+%clear char * retbuf;
+// --
+
+
 %include bzs/db/protocol/tdap/client/table.h
+
+// -- typemap for nsDatabase::readDatabaseDirectory
+%typemap(in, numinputs=0) (_TCHAR* retbuf, uchar_td len)
+{
+  char tmpbuf[255];
+  $1=tmpbuf; 
+  $2=255;
+}
+// nsDatabase::statMsg
+%typemap(in, numinputs=0) (_TCHAR* retbuf)
+{
+  _TCHAR tmpbuf[1024];
+  $1=tmpbuf; 
+}
+
 %include bzs/db/protocol/tdap/client/nsDatabase.h
+%clear _TCHAR* retBuf, uchar_td len;
+%clear _TCHAR* retbuf;
+// --
+
+
 %include bzs/db/protocol/tdap/client/database.h
 %include bzs/rtl/benchmark.h
 %include bzs/db/protocol/tdap/mysql/characterset.h
-// typemap for btrTimeStamp::toString/btrdtoa/btrttoa/btrstoa --
+
+// -- typemap for btrTimeStamp::toString/btrdtoa/btrttoa/btrstoa 
 %typemap(in,numinputs=0) (char * retbuf) (char tmpbuf[255]) { $1=tmpbuf; }
 %include bzs/db/protocol/tdap/btrDate.h
 %clear char * retbuf;
-// clear typemap for typemap for btrTimeStamp::toString/btrdtoa/btrttoa/btrstoa --
+// --
+
 %include bzs/db/protocol/tdap/client/field.h
 %include bzs/db/protocol/tdap/client/fields.h
 %include bzs/db/protocol/tdap/client/memRecord.h

data/build/tdclc/tdclc.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,2,92
- PRODUCTVERSION 2,4,2,92
+ FILEVERSION 2,4,4,97
+ PRODUCTVERSION 2,4,4,97
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C client"
-            VALUE "FileVersion", "2.4.2.92"
+            VALUE "FileVersion", "2.4.4.97"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.2.92"
+            VALUE "ProductVersion", "2.4.4.97"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclcpp/tdclcpp.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,3,92
- PRODUCTVERSION 2,4,3,92
+ FILEVERSION 2,4,4,97
+ PRODUCTVERSION 2,4,4,97
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd C++ client"
-            VALUE "FileVersion", "2.4.3.92"
+            VALUE "FileVersion", "2.4.4.97"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.3.92"
+            VALUE "ProductVersion", "2.4.4.97"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

data/build/tdclrb/tdclrb.rc

@@ -29,8 +29,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,4,3,92
- PRODUCTVERSION 2,4,3,92
+ FILEVERSION 2,4,4,97
+ PRODUCTVERSION 2,4,4,97
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -47,9 +47,9 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "BizStation Corp."
             VALUE "FileDescription", "Transactd Ruby client"
-            VALUE "FileVersion", "2.4.3.92"
+            VALUE "FileVersion", "2.4.4.97"
             VALUE "LegalCopyright", "Copyright(C) 2014 BizStation Corp"
-            VALUE "ProductVersion", "2.4.3.92"
+            VALUE "ProductVersion", "2.4.4.97"
             VALUE "ProductName", "Transactd Client (GPL V2)"
         END
     END

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

@@ -71,12 +71,6 @@ void busyWait(busyWaitArguments* args)
 }
 #endif // TRANSACTD_RB_CALL_WITHOUT_GVL
 
-short __STDCALL dllUnloadCallbackFunc()
-{
-    cpool.reset(0);
-    cpool.m_regitfunc = NULL;
-    return 0;
-}
 
 void releaseConnection(stdDbmCconnectionPool* pool)
 {
@@ -87,19 +81,22 @@ template <class Database_Ptr>
 connectionPool<Database_Ptr>::connectionPool(int maxConnections)
     : m_maxConnections(maxConnections)
 {
-#ifdef USE_DLLUNLOAD_CALLBACK
-    m_regitfunc = nsdatabase::getDllUnloadCallbackFunc();
-    if (m_regitfunc)
-        m_regitfunc(dllUnloadCallbackFunc);
+#ifdef _WIN32
+    m_shutdownFunc = nsdatabase::getWinTPoolShutdownFunc();
 #else
-    m_regitfunc = NULL;
+    m_shutdownFunc = NULL;
 #endif
 }
 
 template <class Database_Ptr> connectionPool<Database_Ptr>::~connectionPool()
 {
-    if (m_regitfunc)
-        m_regitfunc(NULL);
+    if (m_shutdownFunc)
+    {
+        m_shutdownFunc();
+#ifndef SWIGRUBY
+        reset(0);
+#endif
+    }
 }
 
 template <class Database_Ptr>
@@ -231,7 +228,7 @@ bool connectionPool<Database_Ptr>::reset(int waitSec)
     lck.lock();
 #endif
     bool flag = true;
-    for (int j = 0; j < waitSec * 100; j++)
+    for (int j = 0; j < waitSec * 10; j++)
     {
         flag = false;
         for (size_t i = 0; i < m_dbs.size(); i++)

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

@@ -60,12 +60,7 @@ template <class Database_Ptr> class connectionPool
     mutable boost::condition m_busy;
     int m_maxConnections;
     Database_Ptr addOne(const connectParams& param);
-#if (__BCPLUSPLUS__)
-public:
-#endif
-    DLLUNLOADCALLBACK_PTR m_regitfunc;
-    friend short __STDCALL dllUnloadCallbackFunc();
-
+    WIN_TPOOL_SHUTDOWN_PTR m_shutdownFunc;
 public:
     connectionPool(int maxConnections = 0);
     ~connectionPool();

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

@@ -126,6 +126,11 @@ public:
     {
         return nstable::tdapErr(hWnd, retbuf);
     }
+    inline _TCHAR* statMsg(_TCHAR* retbuf)
+    {
+        nstable::tdapErr(0, retbuf);
+        return retbuf;
+    }
 
     void reopen(char_td mode = TD_OPEN_READONLY);
     using nstable::setStat;

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

@@ -41,7 +41,7 @@ using namespace bzs::netsvc::client;
 #endif
 
 void writeErrorLog(int err, const char* msg);
-dllUnloadCallback dllUnloadCallbackFunc = NULL;
+bool win_thread_pool_shutdown = false;
 
 #ifdef USETLS
 tls_key g_tlsiID1;
@@ -105,9 +105,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved)
     {
         try
         {
-        if (dllUnloadCallbackFunc)
-            dllUnloadCallbackFunc();
-        delete m_cons;
+        	delete m_cons;
         }
         catch(...){}
         m_cons = NULL;
@@ -154,8 +152,6 @@ void onUnloadLibrary(void)
 {
     if (m_cons)
     {
-        if (dllUnloadCallbackFunc)
-            dllUnloadCallbackFunc();
         delete m_cons;
         m_cons = NULL;
 #ifdef USETLS
@@ -286,7 +282,6 @@ extern "C" PACKAGE_OSX short_td __STDCALL
             client_t->req().paramMask = P_MASK_POSBLK | P_MASK_DATA |
                                         P_MASK_DATALEN | P_MASK_EX_SENDLEN;
             break;
-        case TD_GETDIRECTORY:
         case TD_SETDIRECTORY:
             break;
         case TD_VERSION:
@@ -353,6 +348,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
                 P_MASK_DATALEN | P_MASK_KEYBUF | P_MASK_KEYNUM;
             break;
         case TD_RESET_CLIENT:
+        case TD_GETDIRECTORY:
             client_t->req().paramMask = P_MASK_KEYONLY;
             break;
         case TD_BUILD_INDEX:
@@ -507,8 +503,7 @@ extern "C" PACKAGE_OSX short_td __STDCALL
     return BTRCALLID(op, pbk, data, datalen, keybuf, keylen, keyNum, cid);
 }
 
-extern "C" PACKAGE_OSX short_td __STDCALL CallbackRegist(dllUnloadCallback func)
+extern "C" PACKAGE_OSX void __STDCALL BeginWinThreadPoolShutdown()
 {
-    dllUnloadCallbackFunc = func;
-    return 0;
+    win_thread_pool_shutdown = true;
 }

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

@@ -760,13 +760,13 @@ bool nsdatabase::isUseTransactd() const
     return (m_btrcallid == getTrnsctdEntryPoint());
 }
 
-void nsdatabase::readDatabaseDirectory(_TCHAR* retBuf, uchar_td buflen)
+void nsdatabase::readDatabaseDirectory(_TCHAR* retbuf, uchar_td buflen)
 {
     // keynum is drive name A=1 B=2 C=3 0=default
     char tmp[128];
     m_stat = m_btrcallid(TD_GETDIRECTORY, NULL, NULL, NULL, tmp, 128, 0,
                          m_nsimpl->cidPtr);
-    toTChar(retBuf, tmp, buflen);
+    toTCharCopy(retbuf, tmp, buflen);
 }
 
 bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
@@ -982,14 +982,15 @@ void nsdatabase::setCheckTablePtr(bool v)
     g_checkTablePtr = v;
 }
 
-DLLUNLOADCALLBACK_PTR nsdatabase::getDllUnloadCallbackFunc()
+WIN_TPOOL_SHUTDOWN_PTR nsdatabase::getWinTPoolShutdownFunc()
 {
     if (hTrsdDLL == NULL)
         hTrsdDLL = LoadLibraryA(LIB_PREFIX TDCLC_LIBNAME);
     if (hTrsdDLL)
-        return (DLLUNLOADCALLBACK_PTR)GetProcAddress((HINSTANCE)hTrsdDLL,
-                                                     "CallbackRegist");
+        return (WIN_TPOOL_SHUTDOWN_PTR)GetProcAddress((HINSTANCE)hTrsdDLL,
+                                                     "BeginWinThreadPoolShutdown");
     return NULL;
+
 }
 
 } // namespace client

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

@@ -114,13 +114,18 @@ public:
     ushort_td trxIsolationServer() const ;
     ushort_td trxLockWaitTimeoutServer() const ;
     short_td tdapErr(HWND hWnd, _TCHAR* retbuf = NULL);
+    inline _TCHAR* statMsg(_TCHAR* retbuf)
+    {
+        tdapErr(0, retbuf);
+        return retbuf;
+    }
     bool useLongFilename();
     void setUseLongFilename(bool value);
     void getBtrVersion(btrVersions* versions, uchar_td* posblk);
     bool setUseTransactd();
     bool isTransactdUri(const _TCHAR* uri);
     bool isUseTransactd() const;
-    void readDatabaseDirectory(_TCHAR* retBuf, uchar_td len);
+    void readDatabaseDirectory(_TCHAR* retbuf, uchar_td len);
     bool connect(const _TCHAR* uri, bool newConnection = false);
     bool disconnect(const _TCHAR* uri = _T(""));
     bool disconnectForReconnectTest(); //for connection brokn emulate
@@ -134,7 +139,7 @@ public:
     /** @cond INTERNAL */
     void setTestPtrIgnore(bool v);
     bool isTestPtrIgnore() const;
-    static DLLUNLOADCALLBACK_PTR getDllUnloadCallbackFunc();
+    static WIN_TPOOL_SHUTDOWN_PTR getWinTPoolShutdownFunc();
     static bool testTablePtr(nstable* ptr);
     static void setCheckTablePtr(bool v);
     /** @endcond */

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

@@ -957,12 +957,12 @@ _TCHAR* nstable::getDirURI(const _TCHAR* path, _TCHAR* buf)
 /* Get file name from full path name.
  *
  */
-_TCHAR* nstable::getFileName(const _TCHAR* path, _TCHAR* filename)
+_TCHAR* nstable::getFileName(const _TCHAR* path, _TCHAR* retbuf)
 {
 
     _TUCHAR* p = (_TUCHAR*)_tcsmrchr((const _TUCHAR*)path, PSEPARATOR_C);
     _TUCHAR* p2 = (_TUCHAR*)_tcsmrchr((const _TUCHAR*)path, '=');
-    filename[0] = 0x00;
+    retbuf[0] = 0x00;
     if (p2 > p)
         p = p2;
 
@@ -970,12 +970,12 @@ _TCHAR* nstable::getFileName(const _TCHAR* path, _TCHAR* filename)
     {
         p++;
         if (*p)
-            _tcscpy(filename, (_TCHAR*)p);
+            _tcscpy(retbuf, (_TCHAR*)p);
     }
     else
-        _tcscpy(filename, path);
+        _tcscpy(retbuf, path);
 
-    return filename;
+    return retbuf;
 }
 
 bool nstable::existsFile(const _TCHAR* filename)

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

@@ -186,6 +186,11 @@ public:
     {
         return doBtrvErr(hWnd, retbuf);
     }
+    inline _TCHAR* statMsg(_TCHAR* retbuf)
+    {
+        doBtrvErr(0, retbuf);
+        return retbuf;
+    }
 
     void beginBulkInsert(int maxBuflen);
     void abortBulkInsert() { doAbortBulkInsert(); }
@@ -220,7 +225,7 @@ public:
     void unlock(bookmark_td& bm);
     void unlock();
     char_td mode() const;
-    static _TCHAR* getFileName(const _TCHAR* uri, _TCHAR* filename);
+    static _TCHAR* getFileName(const _TCHAR* uri, _TCHAR* retbuf);
     static short_td tdapErr(HWND hWnd, short_td status,
                             const _TCHAR* tableName = NULL,
                             _TCHAR* retbuf = NULL);

data/source/bzs/db/protocol/tdap/client/trnsctcl.def

@@ -7,5 +7,5 @@ EXPORTS
    BTRV		@4
    BTRCALLID32	@5
    BTRCALL32	@6
-   CallbackRegist @7
+   BeginWinThreadPoolShutdown @7
 

data/source/bzs/db/protocol/tdap/mysql/request.h

@@ -133,9 +133,14 @@ public:
         if (P_MASK_DATALEN & paramMask)
             memcpy(datalenPtr, (const char*)&resultLen, sizeof(uint_td));
 
-        if (tb && (P_MASK_KEYBUF & paramMask))
+        if (P_MASK_KEYBUF & paramMask)
         {
-            keylen = tb->keyPackCopy((uchar*)p + sizeof(keylen_td));
+            if (tb)
+                keylen = tb->keyPackCopy((uchar*)p + sizeof(keylen_td));
+            else if (keylen && keylen < MAX_KEYLEN)
+                memcpy((uchar*)p + sizeof(keylen_td), keybuf, keylen);
+            else
+                keylen = 0;
             memcpy(p, (const char*)&keylen, sizeof(keylen_td));
             p += sizeof(keylen_td);
             p += keylen;

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

@@ -264,9 +264,8 @@ const char* tabledef::toChar(char* buf, const char* s, int size)
 #ifdef LINUX
     if (schemaCodePage != CP_UTF8)
     {
-        char* p = namebufA();
-        u8tombc(s, strlen(s), p, size);
-        return p;
+        u8tombc(s, strlen(s), buf, size);
+        return buf;
     }
 #endif
     strncpy_s(buf, size, s, size - 1);

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

@@ -71,7 +71,7 @@ typedef short_td(__STDCALL* BTRCALLID_PTR)(ushort_td, void*, void*, uint_td*,
                                            void*, keylen_td, char_td,
                                            uchar_td*);
 
-typedef short_td(__STDCALL* DLLUNLOADCALLBACK_PTR)(dllUnloadCallback func);
+typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 
 /** buffer size
  */
@@ -503,7 +503,7 @@ struct handshale_t
  */
 #define C_INTERFACE_VER_MAJOR "2"//##1 Build marker! Don't remove
 #define C_INTERFACE_VER_MINOR "4"//##2 Build marker! Don't remove
-#define C_INTERFACE_VER_RELEASE "2"//##3 Build marker! Don't remove
+#define C_INTERFACE_VER_RELEASE "4"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
  The default extention of Mac is ".boudle", Therefore ".so" is popular. */
@@ -567,7 +567,7 @@ struct handshale_t
 
 #define CPP_INTERFACE_VER_MAJOR "2"//##4 Build marker! Don't remove
 #define CPP_INTERFACE_VER_MINOR "4"//##5 Build marker! Don't remove
-#define CPP_INTERFACE_VER_RELEASE "3"//##6 Build marker! Don't remove
+#define CPP_INTERFACE_VER_RELEASE "4"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
 #if (__BCPLUSPLUS__ || _MSC_VER)
@@ -584,6 +584,6 @@ struct handshale_t
 
 #define TRANSACTD_VER_MAJOR 2//##7 Build marker! Don't remove
 #define TRANSACTD_VER_MINOR 4//##8 Build marker! Don't remove
-#define TRANSACTD_VER_RELEASE 2//##9 Build marker! Don't remove
+#define TRANSACTD_VER_RELEASE 4//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/netsvc/client/tcpClient.h

@@ -58,6 +58,10 @@ using namespace boost::system;
 #define ERROR_TD_NET_TOO_BIGDATA        3802
 #define MAX_DATA_SIZE 10485760 // 10MB
 
+#ifdef _WIN32
+extern bool win_thread_pool_shutdown;
+#endif
+
 namespace bzs
 {
 namespace netsvc
@@ -149,7 +153,7 @@ class connectionBase : public connection
 protected:
     friend class connections;
 
-    asio::io_service m_ios;
+    asio::io_service* m_ios;
     asio::ip::tcp::endpoint m_ep;
     idirectReadHandler* m_reader;
     size_t m_readLen;
@@ -175,10 +179,20 @@ protected:
   
 public:
     connectionBase(asio::ip::tcp::endpoint& ep)
-        : m_ep(ep), m_reader(NULL), m_refCount(0),
+        : m_ios(new asio::io_service),
+          m_ep(ep), m_reader(NULL), m_refCount(0),
           m_charsetServer(-1), m_connected(false), m_isHandShakable(true)
     {
     }
+    virtual ~connectionBase()
+    {
+        #ifdef _WIN32
+        if (!win_thread_pool_shutdown)
+            delete m_ios;
+        #else
+        delete m_ios;
+        #endif
+    }
     void setDirectReadHandler(idirectReadHandler* p){ m_reader = p; }
     bool isHandShakable() const {return m_isHandShakable;};
     const boost::system::error_code& error() const { return m_e; };
@@ -358,9 +372,9 @@ protected:
         {
             try
             {
-                m_ios.stop();
+                m_ios->stop();
                 m_socket.close();
-                m_ios.reset();
+                m_ios->reset();
             }
             catch (...)
             {
@@ -390,14 +404,14 @@ protected:
     void reconnect(asio::ip::tcp::endpoint& ep)
     {
         cleanup();
-        m_ios.reset();
+        m_ios->reset();
         m_ep = ep;
         connect();
     }
 
 public:
     connectionImple(asio::ip::tcp::endpoint& ep)
-        : connectionBase(ep)/*, m_datalen(0)*/, m_socket(m_ios)
+        : connectionBase(ep)/*, m_datalen(0)*/, m_socket(*m_ios)
     {
     }
 };
@@ -512,8 +526,8 @@ class tcpConnection : public connectionImple<asio::ip::tcp::socket>
         setTimer(connections::connectTimeout);
         m_socket.async_connect(m_ep,
             bind(&tcpConnection::on_connect, this, _error_holder));
-        m_ios.run();
-        m_ios.reset();
+        m_ios->run();
+        m_ios->reset();
     }
 
     void connect()
@@ -522,7 +536,7 @@ class tcpConnection : public connectionImple<asio::ip::tcp::socket>
         m_socket.connect(m_ep);
         m_e = error_code(getErrorCode(), SYSTEM_CATEGORY);
         on_connect(m_e);
-        m_ios.reset();
+        m_ios->reset();
     }
 #endif
 
@@ -595,7 +609,7 @@ public:
     tcpConnection(asio::ip::tcp::endpoint& ep)
         : connectionImple<asio::ip::tcp::socket>(ep),s_io(m_socket)
 #ifdef USE_CONNECT_TIMER
-        , m_timer(m_ios)
+        , m_timer(*m_ios)
 #endif
     {
         m_readbuf.resize(READBUF_SIZE);