transactd 2.3.0 → 2.4.0

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

@@ -32,6 +32,7 @@ typedef void* HANDLE;
 typedef void* HINSTANCE;
 #endif
 #include <bzs/db/protocol/tdap/tdapRequest.h>
+#include <bzs/db/transactd/connectionRecord.h>
 
 #pragma package(smart_init)
 
@@ -144,8 +145,8 @@ struct nsdbimpl
     unsigned short id;
     short snapShotCount;
     nstable* tables[nsdatabase::maxtables];
-    uchar_td clientID[16];
-    uchar_td* cid() { return clientID; }
+    uchar_td cidPtr[16];
+    uchar_td* cid() { return cidPtr; }
     _TCHAR bdfPath[MAX_PATH];
     short tableCount;
     short lockWaitCount;
@@ -154,10 +155,12 @@ struct nsdbimpl
     bool uselongFilename;
     bool localSharing;
     bool ignoreTestPtr;
+    bool reconnected;
     nsdbimpl()
         : refCount(1), tranCount(0), id(0), snapShotCount(0), tableCount(0),
           lockWaitCount(10), lockWaitTime(100), uriMode(false),
-          uselongFilename(false), localSharing(false), ignoreTestPtr(false)
+          uselongFilename(false), localSharing(false), ignoreTestPtr(false),
+          reconnected(false)
     {
     }
 
@@ -166,10 +169,10 @@ struct nsdbimpl
         id = id_;
 
         // make client id
-        memset(clientID, 0, 12);
-        clientID[12] = 'G';
-        clientID[13] = 'X';
-        memcpy(&clientID[14], &id, 2);
+        memset(cidPtr, 0, 12);
+        cidPtr[12] = 'G';
+        cidPtr[13] = 'X';
+        memcpy(&cidPtr[14], &id, 2);
         bdfPath[0] = 0x00;
     }
 
@@ -288,7 +291,14 @@ nsdatabase& nsdatabase::operator=(const nsdatabase& rt)
 
 int nsdatabase::enableTrn() const
 {
-    return m_nsimpl->tranCount;
+    if (m_nsimpl)
+        return m_nsimpl->tranCount;
+    return 0;
+}
+
+bool nsdatabase::isReconnected() const
+{
+    return m_nsimpl->reconnected;
 }
 
 short nsdatabase::stat() const
@@ -298,7 +308,7 @@ short nsdatabase::stat() const
 
 uchar_td* nsdatabase::clientID() const
 {
-    return m_nsimpl->clientID;
+    return m_nsimpl->cidPtr;
 }
 
 short nsdatabase::openTableCount() const
@@ -409,7 +419,7 @@ void nsdatabase::createTable(fileSpec* pfs, uint_td len,
 
     m_stat =
         m_btrcallid(TD_CREATETABLE, posblk, pfs, &len, (void*)p,
-                    (uchar_td)strlen(p), (char_td)mode, m_nsimpl->clientID);
+                    (uchar_td)strlen(p), (char_td)mode, m_nsimpl->cidPtr);
 }
 
 void nsdatabase::dropTable(const _TCHAR* pFullPath)
@@ -438,7 +448,7 @@ void nsdatabase::dropTable(const _TCHAR* pFullPath)
 
     m_stat =
         m_btrcallid(TD_CREATETABLE, posblk, NULL, NULL, (void*)p,
-                    (uchar_td)strlen(p) + 1, CR_SUBOP_DROP, m_nsimpl->clientID);
+                    (uchar_td)strlen(p) + 1, CR_SUBOP_DROP, m_nsimpl->cidPtr);
 }
 
 void nsdatabase::swapTablename(const _TCHAR* Name1, const _TCHAR* Name2)
@@ -453,7 +463,7 @@ void nsdatabase::swapTablename(const _TCHAR* Name1, const _TCHAR* Name2)
 
     m_stat = m_btrcallid(TD_CREATETABLE, posblk, (void*)p, &len, (void*)p2,
                          (uchar_td)strlen(p2), CR_SUBOP_SWAPNAME,
-                         m_nsimpl->clientID);
+                         m_nsimpl->cidPtr);
 }
 
 void nsdatabase::rename(const _TCHAR* pFullPath, const _TCHAR* newName)
@@ -491,7 +501,7 @@ void nsdatabase::rename(const _TCHAR* pFullPath, const _TCHAR* newName)
 
     m_stat = m_btrcallid(TD_CREATETABLE, posblk, (void*)p, &len, (void*)bufNew,
                          (uchar_td)strlen(bufNew), CR_SUBOP_RENAME,
-                         m_nsimpl->clientID);
+                         m_nsimpl->cidPtr);
 }
 
 void nsdatabase::registerTable(nstable* tb)
@@ -572,9 +582,9 @@ void nsdatabase::reset()
     if (m_btrcallid)
     {
         m_stat = m_btrcallid(TD_RESET_CLIENT, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->clientID);
+                             m_nsimpl->cidPtr);
         m_stat = m_btrcallid(TD_STOP_ENGINE, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->clientID);
+                             m_nsimpl->cidPtr);
         if (m_stat == ERROR_TD_NOT_CONNECTED)
             m_stat = STATUS_SUCCESS;
     }
@@ -585,9 +595,23 @@ void nsdatabase::reset()
 void nsdatabase::beginSnapshot(short bias)
 {
     if (m_nsimpl->snapShotCount == 0)
+    {
         m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->clientID);
-    m_nsimpl->snapShotCount++;
+                             m_nsimpl->cidPtr);
+#ifdef TEST_RECONNECT
+        if (canRecoverNetError(m_stat))
+        {
+            reconnect();
+            if (m_stat) return;
+            m_stat = m_btrcallid(TD_BEGIN_SHAPSHOT + bias, NULL, NULL, NULL, NULL,
+                                     0, 0, m_nsimpl->cidPtr);
+        }
+#endif
+        if (m_stat == 0)
+            m_nsimpl->snapShotCount++;
+    }
+    else
+        m_nsimpl->snapShotCount++;
 }
 
 void nsdatabase::endSnapshot()
@@ -595,7 +619,9 @@ void nsdatabase::endSnapshot()
     m_nsimpl->snapShotCount--;
     if (m_nsimpl->snapShotCount == 0)
         m_stat = m_btrcallid(TD_END_SNAPSHOT, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->clientID);
+                             m_nsimpl->cidPtr);
+    if (m_nsimpl->snapShotCount < 0)
+        m_nsimpl->snapShotCount = 0;
 }
 
 void nsdatabase::beginTrn(short BIAS)
@@ -603,7 +629,7 @@ void nsdatabase::beginTrn(short BIAS)
     if (m_nsimpl->tranCount == 0)
     {
         m_stat = m_btrcallid((ushort_td)(BIAS + TD_BEGIN_TRANSACTION), NULL,
-                             NULL, NULL, NULL, 0, 0, m_nsimpl->clientID);
+                             NULL, NULL, NULL, 0, 0, m_nsimpl->cidPtr);
         if (m_stat == 0)
             m_nsimpl->tranCount++;
     }
@@ -618,7 +644,7 @@ void nsdatabase::endTrn()
     if (m_nsimpl->tranCount == 0)
     {
         m_stat = m_btrcallid(TD_END_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0,
-                             m_nsimpl->clientID);
+                             m_nsimpl->cidPtr);
 
 #ifdef _WIN32
         g_lastTrnTime = GetTickCount();
@@ -631,7 +657,7 @@ void nsdatabase::endTrn()
 void nsdatabase::abortTrn()
 {
     m_stat = m_btrcallid(TD_ABORT_TRANSACTION, NULL, NULL, NULL, NULL, 0, 0,
-                         m_nsimpl->clientID);
+                         m_nsimpl->cidPtr);
 
     m_nsimpl->tranCount = 0;
 #ifdef _WIN32
@@ -643,14 +669,14 @@ ushort_td nsdatabase::trxIsolationServer() const
 {
     if (!isUseTransactd())
         return 0xFFFF;
-    return *((ushort_td*)(m_nsimpl->clientID + sizeof(char*)));
+    return *((ushort_td*)(m_nsimpl->cidPtr + sizeof(char*)));
 }
 
 ushort_td nsdatabase::trxLockWaitTimeoutServer() const
 {
     if (!isUseTransactd())
         return 0xFFFF;
-    return *((ushort_td*)(m_nsimpl->clientID + sizeof(char*) + sizeof(ushort_td)));
+    return *((ushort_td*)(m_nsimpl->cidPtr + sizeof(char*) + sizeof(ushort_td)));
 }
 
 
@@ -669,7 +695,7 @@ void nsdatabase::getBtrVersion(btrVersions* Vers, uchar_td* posblk)
     uint_td datalen = sizeof(btrVersions);
 
     m_stat = m_btrcallid(TD_VERSION, posblk, Vers, &datalen, NULL, 0, 0,
-                         m_nsimpl->clientID);
+                         m_nsimpl->cidPtr);
     {
         bool remote = false;
         if (uriMode())
@@ -739,16 +765,23 @@ 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->clientID);
+                         m_nsimpl->cidPtr);
     toTChar(retBuf, tmp, buflen);
 }
 
 bool nsdatabase::connect(const _TCHAR* URI, bool newConnection)
 {
     if (isTransactdUri(URI))
+    {
         if (!setUseTransactd())
             return false;
+    }else
+    {
+        m_stat = 0;
+        if (_tcsstr(URI, _T("://")) == NULL)
+            return true;
 
+    }
     uint_td datalen = 0;
 
     char uri_a[MAX_PATH] = { 0x00 };
@@ -794,7 +827,7 @@ bool nsdatabase::disconnectForReconnectTest()
 }
 
 /* TD_RECONNECT data buffer structure
-   
+
    1 byte keynum
    1 byte bookmark size
    n byte bookmark
@@ -806,7 +839,7 @@ void nsdatabase::doReconnect(nstable* tb)
     char uri_a[MAX_PATH] = { 0x00 };
     tb->abortBulkInsert();
     datalen = tb->buflen();
-    tdap::posblk* pb = (tdap::posblk*)tb->posblk(); 
+    tdap::posblk* pb = (tdap::posblk*)tb->posblk();
     char* databuf = new char[datalen];
     databuf[0] = tb->keyNum();
     memcpy(databuf + 1, &pb->bookmarkLen, pb->bookmarkLen + 1);
@@ -817,41 +850,59 @@ void nsdatabase::doReconnect(nstable* tb)
     delete [] databuf;
 }
 
+bool nsdatabase::doReopenTables()
+{
+    // Indicate reconnected, that serverPrepared are invalid.
+    m_nsimpl->reconnected = true;
+    if (!doReopenDatabaseSchema()) return false;
+    //Whole table, restore position.
+    for (int i = 0 ;i <= m_nsimpl->tableCount; ++i)
+    {
+        nstable* tb = m_nsimpl->tables[i];
+        if (tb && tb->isOpen())
+        {
+            doReconnect(tb);
+            if (m_stat != 0) return false;
+        }
+    }
+    return (m_stat == 0);
+}
+
+bool reconnectSharedConnection(const void* ptr)
+{
+    boost::mutex::scoped_lock lck(g_mutex);
+    for (int i = 0; i < MAX_BTRENGIN; ++i)
+    {
+        if (engins()[i])
+        {
+            void* p = (*((void**)engins()[i]->m_nsimpl->cidPtr));
+            if (p == ptr)
+            {
+                if (!engins()[i]->doReopenTables())
+                    return false;
+            }
+        }
+    }
+    return true;
+}
+
 bool nsdatabase::reconnect()
 {
     //Transactd only
     if (!isUseTransactd())
         return false;
+
     m_nsimpl->tranCount = 0;
     m_nsimpl->snapShotCount = 0;
-
-   
     uint_td datalen = 0;
     char uri_a[MAX_PATH] = { 0x00 };
     const char* p = toServerUri(uri_a, MAX_PATH, m_nsimpl->bdfPath, true);
     m_stat = m_btrcallid(TD_CONNECT, NULL, NULL, &datalen, (void*)p,
-                         (keylen_td)(strlen(p) + 1), 
+                         (keylen_td)(strlen(p) + 1),
                          LG_SUBOP_RECONNECT, clientID());
     if (m_stat) return false;
+    return reconnectSharedConnection((*(void**)m_nsimpl->cidPtr));
 
-    //Whole table, restore position.
-    nstable* lockedTable = NULL; //This is only one.
-    for (int i=0;i<m_nsimpl->tableCount;++i)
-    {
-        nstable* tb = m_nsimpl->tables[i];
-        if (tb && tb->isOpen())
-        {
-            tdap::posblk* pb = (tdap::posblk*)tb->posblk();
-            if (pb->lock)
-                lockedTable = tb;
-            else
-                doReconnect(tb);
-            if (m_stat != 0) break;
-        }
-    }
-    if (lockedTable)
-        doReconnect(lockedTable);
-    return (m_stat == 0);
 }
 
 bool nsdatabase::trnsactionFlushWaitStatus()

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

@@ -55,11 +55,11 @@ DLLLIB BTRCALLID_PTR getTrnsctdEntryPoint();
 class DLLLIB nsdatabase
 {
     friend class nstable;
-
+    friend bool reconnectSharedConnection(const void* ptr);
     struct nsdbimpl* m_nsimpl;
     nsdatabase(const nsdatabase&);
     static unsigned int m_execCodepage;
-
+    bool doReopenTables();
 protected:
     BTRCALLID_PTR m_btrcallid;
     short m_stat;
@@ -78,6 +78,8 @@ protected:
     void addref();
     void internalRelease() { nsdatabase::release(); }
     void doReconnect(nstable* tb);
+    virtual bool doReopenDatabaseSchema(){ return true; }
+    
 public:
     nsdatabase();
     virtual void release();
@@ -123,6 +125,7 @@ public:
     bool disconnect(const _TCHAR* uri = _T(""));
     bool disconnectForReconnectTest(); //for connection brokn emulate
 	bool reconnect();
+    bool isReconnected() const;
 
     static const int maxtables = 50;
     static bool trnsactionFlushWaitStatus();

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

@@ -49,7 +49,8 @@ namespace client
 struct nstimpl
 {
     nstimpl()
-        : refCount(1), bulkIns(NULL), mode(0), shared(false), isOpen(false)
+        : refCount(1), bulkIns(NULL), percentage(0),bookmarkLen(0),mode(0),
+            shared(false), isOpen(false)
     {
         memset(posblk, 0 ,POS_BLOCK_SIZE);
     }
@@ -57,6 +58,7 @@ struct nstimpl
     bulkInsert* bulkIns;
     nsdatabase* nsdb;
     percentage_td percentage;
+    ushort_td bookmarkLen;
     bookmark_td bookmark;
     _TCHAR uri[MAX_PATH];
     uchar_td posblk[POS_BLOCK_SIZE];
@@ -126,16 +128,21 @@ _TCHAR* nstable::getErrorMessage(int errorCode, _TCHAR* buf, size_t size)
                    : bm and keynumber are ingored.
         )
  */
-void nstable::unlock(bookmark_td bm)
+void nstable::unlock(bookmark_td& bm)
 {
     void* db = m_pdata;
     if (m_keynum == -1)
         m_pdata = &bm;
-    m_datalen = 4;
+    m_datalen = bookmarkLen();
     tdap(TD_UNLOCK);
     m_pdata = db;
 }
 
+void nstable::unlock()
+{
+    tdap(TD_UNLOCK);
+}
+
 bool nstable::isUseTransactd() const
 {
     return nsdb()->isUseTransactd();
@@ -347,10 +354,6 @@ char_td nstable::mode() const
 
 void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
 {
-    void* svm_keybuf = m_keybuf;
-    char_td svm_keynum = m_keynum;
-    keylen_td svm_keybuflen = m_keylen;
-
     if (m_impl->nsdb == NULL)
     {
         m_stat = STATUS_LMITS_MAX_TABLES;
@@ -376,6 +379,11 @@ void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
         }
     }
 
+    void* svm_keybuf = m_keybuf;
+    char_td svm_keynum = m_keynum;
+    keylen_td svm_keybuflen = m_keylen;
+    void* data_bak = m_pdata;
+
     // convert utf8 string
     char tmpName[MAX_PATH] = { 0x00 };
     const char* p = nsdatabase::toServerUri(tmpName, MAX_PATH, m_impl->uri,
@@ -389,6 +397,7 @@ void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
         m_keynum = mode;
 
     char ownerNameBuf[OWNERNAME_SIZE] = { 0x00 };
+
     if (NULL != ownerName && 0x00 != ownerName[0])
     {
         const char* p2 = toChar(ownerNameBuf, ownerName, OWNERNAME_SIZE);
@@ -397,21 +406,34 @@ void nstable::doOpen(const _TCHAR* name, char_td mode, const _TCHAR* ownerName)
         if (m_datalen > 11)
         {
             m_stat = STATUS_TOO_LONG_OWNERNAME;
-            return;
+            goto clean;
         }
+        if (m_datalen < sizeof(unsigned int))
+            m_datalen = sizeof(unsigned int);/* for bookmarklen*/
     }
     else
-        m_datalen = 0;
-
+    {
+        m_impl->bookmarkLen = 0;
+        m_pdata = &m_impl->bookmarkLen;
+        m_datalen = sizeof(ushort_td);/* for bookmarklen*/
+    }
     tdap(TD_OPENTABLE);
     if (m_stat == STATUS_SUCCESS)
     {
         m_impl->isOpen = true;
         m_impl->mode = mode;
+        if (!isUseTransactd())
+            m_impl->bookmarkLen = BTRV_BOOKMARK_SIZE;
+        else if (m_impl->bookmarkLen == 0)
+            m_impl->bookmarkLen = BTRV_BOOKMARK_SIZE;
+        else if (m_impl->bookmarkLen == 0xFFFF) //No primary
+            m_impl->bookmarkLen = 0;
     }
+clean:
     m_keybuf = svm_keybuf;
     m_keynum = svm_keynum;
     m_keylen = svm_keybuflen;
+    m_pdata = data_bak;
 }
 
 void nstable::doUpdate(eUpdateType type)
@@ -518,9 +540,9 @@ ushort_td nstable::doInsert(bool ncc)
             m_impl->bulkIns->insert((const char*)data(), m_datalen, this);
     else
     {
-        tdap(TD_REC_INSERT);
         if (ncc)
             m_keynum = -1;
+        tdap(TD_REC_INSERT);
         if (m_stat == STATUS_SUCCESS)
             ins_rows = 1;
     }
@@ -570,25 +592,48 @@ void nstable::doAbortBulkInsert()
     m_stat = STATUS_SUCCESS;
 }
 
+ushort_td nstable::bookmarkLen() const
+{
+    return m_impl->bookmarkLen;
+}
+
 bookmark_td nstable::bookmark()
 {
     void* db = m_pdata;
-
+    m_impl->bookmark.empty = true;
     m_pdata = &m_impl->bookmark;
-    m_datalen = sizeof(bookmark_td);
+    m_datalen = m_impl->bookmarkLen;
     tdap(TD_BOOKMARK);
+    if (m_stat == 0)
+        m_impl->bookmark.empty = false;
     m_pdata = db;
 
     return m_impl->bookmark;
 }
 
-void nstable::seekByBookmark(bookmark_td bm, ushort_td LockBias)
+void nstable::seekByBookmark(bookmark_td& bm, ushort_td lockBias)
+{
+    seekByBookmark(&bm, lockBias);
+}
+
+void nstable::seekByBookmark(bookmark_td* bm, ushort_td lockBias)
 {
+    if (!bm)
+    {
+        m_stat = STATUS_INVALID_BOOKMARK;
+        return;
+    }
+
     int count = 0;
-    memcpy(m_pdata, &bm, sizeof(bookmark_td));
+    if (m_buflen < (uint_td)m_impl->bookmarkLen)
+    {
+        m_buflen = m_impl->bookmarkLen;
+        m_pdata = realloc(m_pdata, m_buflen);
+    }
+    memcpy(m_pdata, bm, m_impl->bookmarkLen);
     m_datalen = m_buflen;
     m_keylen = m_keybuflen;
-    tdap((ushort_td)(TD_MOVE_BOOKMARK + LockBias));
+    tdap((ushort_td)(TD_MOVE_BOOKMARK + lockBias));
     if (m_stat == STATUS_SUCCESS)
         onReadAfter();
     // TODO: This code has some problem.
@@ -598,7 +643,7 @@ void nstable::seekByBookmark(bookmark_td bm, ushort_td LockBias)
         m_buflen = m_buflen * 2;
         m_datalen = m_buflen;
         m_pdata = realloc(m_pdata, m_buflen);
-        memcpy(m_pdata, &bm, sizeof(bookmark_td));
+        memcpy(m_pdata, bm, m_impl->bookmarkLen);
         tdap(TD_MOVE_BOOKMARK);
         if (m_stat == STATUS_SUCCESS)
         {
@@ -622,21 +667,17 @@ percentage_td nstable::getPercentage()
     return m_impl->percentage;
 }
 
-percentage_td nstable::getPercentage(bookmark_td bm)
+percentage_td nstable::getPercentage(bookmark_td& bm)
 {
-    void* db = m_pdata;
     char_td ky = m_keynum;
 
-    m_pdata = &m_impl->percentage;
-    m_datalen = sizeof(percentage_td);
+    memcpy(m_pdata, &bm, bookmarkLen());
+    m_datalen = std::max<int>(bookmarkLen(), sizeof(percentage_td));
     m_keynum = -1;
-
-    m_impl->percentage = bm;
     m_keylen = m_keybuflen;
     tdap(TD_GET_PER);
+    memcpy(&m_impl->percentage, m_pdata, sizeof(percentage_td));
     m_impl->percentage &= 0xffff;
-
-    m_pdata = db;
     m_keynum = ky;
 
     return m_impl->percentage;
@@ -812,8 +853,17 @@ void nstable::tdap(ushort_td op)
         case STATUS_FILE_LOCKED:
             Sleep(m_impl->nsdb->lockWaitTime());
             break;
-
         default:
+#ifdef TEST_RECONNECT
+            if (canRecoverNetError(m_stat))
+            {
+                m_impl->nsdb->reconnect();
+                if (m_stat) return;
+                m_stat = ERROR_TD_NET_TIMEOUT;
+                LoopCount = -1;
+                break;
+            }
+#endif
             return;
         }
     } while ((m_stat != STATUS_SUCCESS) &&

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

@@ -143,7 +143,7 @@ protected:
     */
     void destroy();
     void setShared();
-
+    void seekByBookmark(bookmark_td* bm, ushort_td lockBias = LOCK_BIAS_DEFAULT);
 public:
     explicit nstable(nsdatabase* pbe);
     void addref(void);
@@ -205,18 +205,20 @@ public:
     void stepLast(ushort_td lockBias = LOCK_BIAS_DEFAULT);
     void stepPrev(ushort_td lockBias = LOCK_BIAS_DEFAULT);
     void stepNext(ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    ushort_td bookmarkLen() const ;
     bookmark_td bookmark();
-    void seekByBookmark(bookmark_td bm, ushort_td lockBias = LOCK_BIAS_DEFAULT);
+    void seekByBookmark(bookmark_td& bm, ushort_td lockBias = LOCK_BIAS_DEFAULT);
     void seekByBookmark();
     percentage_td getPercentage();
-    percentage_td getPercentage(bookmark_td bm);
+    percentage_td getPercentage(bookmark_td& bm);
     void seekByPercentage();
     void seekByPercentage(percentage_td pc);
     void setOwnerName(const _TCHAR* name, char_td enctype = 0);
     void clearOwnerName();
     ushort_td recordLength();
     void stats(void* databuffer, uint_td buflen, bool estimate = true);
-    void unlock(bookmark_td bm = 0);
+    void unlock(bookmark_td& bm);
+    void unlock();
     char_td mode() const;
     static _TCHAR* getFileName(const _TCHAR* uri, _TCHAR* filename);
     static short_td tdapErr(HWND hWnd, short_td status,