[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-filesystem-cvs
Subject:    [Filesystem-cvs] http httpfsys.cpp,1.187,1.187.4.1
From:       mingda () helixcommunity ! org
Date:       2013-10-16 9:08:13
[Download RAW message or body]

Update of /cvsroot/filesystem/http
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv16262

Modified Files:
      Tag: SERVER_15_1_0
	httpfsys.cpp 
Log Message:
Committed to : SERVER_15_1_0_RN, HEAD.
Reviewed by: Richard.
Verification Build:


Synopsis
========
This CR fix bug: 
(HLXSRV-688) Server Fault Report frequently when enable Pre-segment.

Branch : SERVER_15_1_0_RN, HEAD

Suggested Reviewer : Anyone

Description
===========
Stack Trace:
0x5bbdd5: _Z9dump_infoiiPKciP7siginfoP8ucontext+0x4c5 [00943dbc 00000000 2d2d2d0a \
                2d2d2d2d 2d2d2d2d 2d2d2d2d] : rmserver.bin
0x5c3192: _Z12server_faultiP7siginfoP8ucontext+0x432 [ffffffff ffffffff ffffffff \
                ffffffff ffffffff ffffffff] : rmserver.bin
0x3abc80f500: (null) [00000000 00000000 32f01000 00007f1e 00000000 ffffffff] : \
                libpthread.so.0
0x7f1e5eb2458b: (null) [43f78af8 00007f1e 4005acc0 00007f1e 40084ad0 00007f1e] : \
                httpfsys.so
0x7f1e5eb2488f: (null) [32dff060 00007f1e 330fab40 00007f1e 5eb4cd5a 00007f1e] : \
                httpfsys.so
0x7f1e5eb4cd5a: (null) [0065d557 00000000 32dff020 00007f1e 2864fd18 00007f1e] : \
                httpfsys.so
0x65d557: _ZN6ServPQ22execute_locked_elementEP10ServPQElem+0xc7 [2864fd18 00007f1e \
                32dff060 00007f1e 01821d40 00000000] : rmserver.bin
0x5e14c0: _ZN12ServerEngine8mainloopEi+0x1380 [ffffffff ffffffff ffffffff ffffffff \
                ffffffff ffffffff] : rmserver.bin
0x5cf989: _ZN23MiscProcessInitCallback4funcEP7Process+0x2d9 [2d6e6f4e 746c754d \
                616f4c69 35382064 34383636 3a363532] : rmserver.bin
0x5bf455: _Z17PthreadEntryPointP11thread_args+0x185 [016d54d0 00000000 32f01000 \
                00007f1e 00000000 00000000] : rmserver.bin
0x3abc807851: (null) [ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff] : \
                libpthread.so.0
0x3abbce890d: clone+0x6d [ffffffff ffffffff ffffffff ffffffff ffffffff ffffffff] : \
libc.so.6


1, In CHTTPFileObject::ProcessIdle(), if m_pFileResponse is NULL, it will cause the \
CA above.

2, In CVcasScrambler::FileObjectReady, it should make sure m_pFobj is either calling \
Init() or calling Close(). Otherwise, it will lead to issue 1.  

Files Affected
==============
filesystem/http/httpfsys.cpp

Test perform
================
linux-rhel6-x86_64

Integration Tests:
N/A

Performance Tests: 
N/A

QA Hints
========
None.



Index: httpfsys.cpp
===================================================================
RCS file: /cvsroot/filesystem/http/httpfsys.cpp,v
retrieving revision 1.187
retrieving revision 1.187.4.1
diff -u -d -r1.187 -r1.187.4.1
--- httpfsys.cpp	17 May 2013 10:25:27 -0000	1.187
+++ httpfsys.cpp	16 Oct 2013 09:08:10 -0000	1.187.4.1
@@ -3007,7 +3007,7 @@
     // until we receive enough data from the socket.
     if (!theErr && m_bSeekPending && !m_bByteRangeSeekPending)
     {
-        if (m_ulCurrentReadPosition <= m_nContentRead)
+        if (m_ulCurrentReadPosition <= m_nContentRead && m_pFileResponse)
         {
             HXLOGL2(HXLOG_HTTP, "ProcessIdle notices SeekDone");
 
@@ -3023,7 +3023,7 @@
                 HX_LOCK(m_pMutex);
             }
         }
-        else if (m_bReadContentsDone)
+        else if (m_bReadContentsDone && m_pFileResponse)
         {
             HXLOGL1(HXLOG_HTTP, "ProcessIdle notices SeekDone will fail");
 


_______________________________________________
Filesystem-cvs mailing list
Filesystem-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/filesystem-cvs


[prev in list] [next in list] [prev in thread] [next in thread]