From 2e184d62e81f25576d7abde59adda5a04b99da05 Mon Sep 17 00:00:00 2001
From: Matej Sekoranja <unknown>
Date: Thu, 13 Feb 2014 23:55:19 +0100
Subject: [PATCH] fixed transprort weak_ptr

---
 pvAccessApp/remote/codec.cpp |  9 +++------
 pvAccessApp/remote/codec.h   | 29 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pvAccessApp/remote/codec.cpp b/pvAccessApp/remote/codec.cpp
index 6165f82..547072a 100644
--- a/pvAccessApp/remote/codec.cpp
+++ b/pvAccessApp/remote/codec.cpp
@@ -1128,6 +1128,7 @@ namespace epics {
     }
 
 
+    // NOTE: must not be called from constructor (e.g. needs shared_from_this())
     void BlockingAbstractCodec::start() {
 
       LOG(logLevelTrace, "BlockingAbstractCodec::start enter: (threadId: %u)", 
@@ -1164,9 +1165,8 @@ namespace epics {
         "BlockingAbstractCodec::receiveThread enter: (threadId: %u)", 
         epicsThreadGetIdSelf());
 
-
       BlockingAbstractCodec *bac = static_cast<BlockingAbstractCodec *>(param);
-      Transport::shared_pointer ptr (bac->shared_from_this());
+      Transport::shared_pointer ptr = bac->shared_from_this();
 
       while (bac->isOpen())
       {
@@ -1194,8 +1194,7 @@ namespace epics {
         epicsThreadGetIdSelf());
 
       BlockingAbstractCodec *bac = static_cast<BlockingAbstractCodec *>(param);
-
-      Transport::shared_pointer ptr (bac->shared_from_this());
+      Transport::shared_pointer ptr = bac->shared_from_this();
       
       bac->setSenderThread();
 
@@ -1480,8 +1479,6 @@ namespace epics {
       // TODO implement priorities in Reactor... not that user will
       // change it.. still getPriority() must return "registered" priority!
 
-      start();
-
       LOG(logLevelTrace, 
         "BlockingServerTCPTransportCodec constructed  (threadId: %u)", 
         epicsThreadGetIdSelf());
diff --git a/pvAccessApp/remote/codec.h b/pvAccessApp/remote/codec.h
index 7b75d62..58f2c3c 100644
--- a/pvAccessApp/remote/codec.h
+++ b/pvAccessApp/remote/codec.h
@@ -236,12 +236,6 @@ namespace epics {
     };
 
 
-    class simulate_finally_exception: public std::runtime_error {
-    public:
-      explicit simulate_finally_exception(
-        const std::string &s): std::runtime_error(s) {}
-    };
-
     class io_exception: public std::runtime_error {
     public:
       explicit io_exception(const std::string &s): std::runtime_error(s) {}
@@ -388,7 +382,8 @@ namespace epics {
 
     class BlockingAbstractCodec: 
       public AbstractCodec,
-      public std::tr1::enable_shared_from_this<BlockingAbstractCodec>   {
+      public std::tr1::enable_shared_from_this<BlockingAbstractCodec>
+    {
 
     public: 
 
@@ -425,7 +420,9 @@ namespace epics {
     };
 
 
-    class  BlockingSocketAbstractCodec: public BlockingAbstractCodec {
+    class  BlockingSocketAbstractCodec:
+        public BlockingAbstractCodec
+    {
 
     public: 
 
@@ -588,9 +585,9 @@ namespace epics {
 
 
       bool directSerialize(
-        epics::pvData::ByteBuffer *existingBuffer, 
-        const char* toSerialize,
-        std::size_t elementCount, std::size_t elementSize)  
+        epics::pvData::ByteBuffer * /*existingBuffer*/, 
+        const char* /*toSerialize*/,
+        std::size_t /*elementCount*/, std::size_t /*elementSize*/)  
       {
 
         LOG(logLevelTrace, 
@@ -601,9 +598,9 @@ namespace epics {
       }
 
 
-      bool directDeserialize(epics::pvData::ByteBuffer *existingBuffer, 
-        char* deserializeTo,
-        std::size_t elementCount, std::size_t elementSize)  { 
+      bool directDeserialize(epics::pvData::ByteBuffer * /*existingBuffer*/, 
+        char* /*deserializeTo*/,
+        std::size_t /*elementCount*/, std::size_t /*elementSize*/)  { 
 
           LOG(logLevelTrace, 
             "BlockingTCPTransportCodec::directDeserialize() enter:"
@@ -635,6 +632,8 @@ namespace epics {
 
         Transport::shared_pointer thisSharedPtr = shared_from_this();
         _context->getTransportRegistry()->put(thisSharedPtr);
+        
+        start();
       }
 
     protected:
@@ -684,6 +683,7 @@ namespace epics {
     public:
       POINTER_DEFINITIONS(BlockingServerTCPTransportCodec);
 
+    protected:
       BlockingServerTCPTransportCodec(
         Context::shared_pointer const & context, 
         SOCKET channel,
@@ -691,6 +691,7 @@ namespace epics {
         int32_t sendBufferSize, 
         int32_t receiveBufferSize );
 
+    public:
       static shared_pointer create(
         Context::shared_pointer const & context, 
         SOCKET channel,