Add deep_copy() in Transaction

Change-Id: I75d6c9fc8fee7f3cf0db6d8f9e9e1e8e52131a11
Signed-off-by: Li Zhang <li2012.zhang@samsung.com>

diff --git a/ism/modules/frontend/scim_socket_frontend.cpp b/ism/modules/frontend/scim_socket_frontend.cpp
index ac504ba..9ec353d 100644 (file)
--- a/ism/modules/frontend/scim_socket_frontend.cpp
+++ b/ism/modules/frontend/scim_socket_frontend.cpp
@@ -564,10 +564,10 @@ SocketFrontEnd::get_surrounding_text (int id, WideString &text, int &cursor, int
                  * but in previous frame of stack, m_receive_trans has not finished reading,
                  */
                 Transaction _tran;
-                _tran = m_receive_trans;
+                _tran.deep_copy (m_receive_trans);
                 m_continue_mark = STATUS_NONE;
                 socket_receive_callback (&m_socket_server, socket_client);
-                m_receive_trans = _tran;
+                m_receive_trans.deep_copy (_tran);
                 ContinueMark status = get_continue_mark ();
                 if (status == STATUS_DISCONNECT)
                     return false;
@@ -638,10 +638,10 @@ SocketFrontEnd::get_selection (int id, WideString &text)
             cont = true;
             while (true) {
                 Transaction _tran;
-                _tran = m_receive_trans;
+                _tran.deep_copy (m_receive_trans);
                 m_continue_mark = STATUS_NONE;
                 socket_receive_callback (&m_socket_server, socket_client);
-                m_receive_trans = _tran;
+                m_receive_trans.deep_copy (_tran);
                 ContinueMark status = get_continue_mark ();
                 if (status == STATUS_DISCONNECT)
                     return false;

diff --git a/ism/src/scim_transaction.cpp b/ism/src/scim_transaction.cpp
index f6a5625..13eb1db 100644 (file)
--- a/ism/src/scim_transaction.cpp
+++ b/ism/src/scim_transaction.cpp
@@ -59,6 +59,9 @@ class TransactionHolder
 {
     mutable int    m_ref;
 
+    TransactionHolder (const TransactionHolder &);
+    TransactionHolder & operator = (const TransactionHolder &);
+
 public:
     size_t         m_buffer_size;
     size_t         m_write_pos;
@@ -74,39 +77,10 @@ public:
             throw Exception ("TransactionHolder::TransactionHolder() Out of memory");
     }
 
-    TransactionHolder (TransactionHolder &other)
-        : m_ref (other.m_ref),
-          m_buffer_size (other.m_buffer_size),
-          m_write_pos (other.m_write_pos),
-          m_buffer ((unsigned char*) malloc (other.m_buffer_size)) {
-        if (!m_buffer)
-            throw Exception ("TransactionHolder::TransactionHolder() Out of memory");
-
-        if (m_buffer_size && m_buffer)
-            memcpy (m_buffer, other.m_buffer, m_buffer_size);
-    }
-
     ~TransactionHolder () {
         free (m_buffer);
     }
 
-    TransactionHolder & operator = (const TransactionHolder &other) {
-        m_ref = other.m_ref;
-        m_buffer_size = other.m_buffer_size;
-        m_write_pos = other.m_write_pos;
-        if (m_buffer)
-            free (m_buffer);
-
-        m_buffer = (unsigned char*) malloc (other.m_buffer_size);
-        if (!m_buffer)
-            throw Exception ("TransactionHolder::TransactionHolder() Out of memory");
-
-        if (m_buffer_size && m_buffer)
-            memcpy (m_buffer, other.m_buffer, m_buffer_size);
-
-        return *this;
-    }
-
     bool valid () const {
         return m_buffer && m_buffer_size;
     }
@@ -170,14 +144,19 @@ Transaction::Transaction (size_t bufsize)
     m_reader->attach (*this);
 }
 
-Transaction &
-Transaction::operator = (const Transaction & _tran)
+void
+Transaction::deep_copy(const Transaction & _tran)
 {
-    m_holder->request_buffer_size (_tran.get_size());
-    _tran.write_to_buffer (m_holder->m_buffer,_tran.get_size());
+    m_reader->detach ();
+    m_holder->unref ();
+    m_holder = new TransactionHolder (_tran.get_size ());
+    m_holder->ref ();
+    m_reader->attach (*this);
+
+    m_holder->request_buffer_size (_tran.get_size ());
+    _tran.write_to_buffer (m_holder->m_buffer,_tran.get_size ());
     m_holder->m_write_pos = _tran.get_size ();
     m_reader->set_position (_tran.m_reader->get_position ());
-    return *this;
 }
 
 Transaction::~Transaction ()

diff --git a/ism/src/scim_transaction.h b/ism/src/scim_transaction.h
index ca58880..37b73c3 100644 (file)
--- a/ism/src/scim_transaction.h
+++ b/ism/src/scim_transaction.h
@@ -94,6 +94,7 @@ class EXAPI Transaction
     TransactionReader * m_reader;
 
     Transaction (const Transaction &);
+    Transaction & operator = (const Transaction &);
 public:
     /**
      * @brief Constructor.
@@ -107,7 +108,10 @@ public:
      */
     ~Transaction ();
 
-    Transaction & operator = (const Transaction &);
+    /**
+     * @brief Copy the transaction in a new data holder.
+     */
+    void deep_copy(const Transaction &);
 
     /**
      * @brief Check if the transaction is valid.