[rhmessaging-commits] rhmessaging commits: r1859 - store/trunk/cpp/lib/jrnl.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2008-04-08 10:20:25 -0400 (Tue, 08 Apr 2008)
New Revision: 1859

Modified:
   store/trunk/cpp/lib/jrnl/pmgr.cpp
   store/trunk/cpp/lib/jrnl/rmgr.cpp
   store/trunk/cpp/lib/jrnl/wmgr.cpp
Log:
Corrected calls to clean() in pmgr and wmgr that previously caused valgrind to fail internally.

Modified: store/trunk/cpp/lib/jrnl/pmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/pmgr.cpp	2008-04-08 12:08:21 UTC (rev 1858)
+++ store/trunk/cpp/lib/jrnl/pmgr.cpp	2008-04-08 14:20:25 UTC (rev 1859)
@@ -95,7 +95,7 @@
 
 pmgr::~pmgr()
 {
-    clean();
+    pmgr::clean();
 }
 
 void
@@ -106,7 +106,7 @@
     _pg_cntr = 0;
     _pg_offset_dblks = 0;
     _aio_evt_rem = 0;
-    clean();
+    pmgr::clean();
 
     // 1. Allocate page memory (as a single block)
     size_t pagesize = _pages * _pagesize * _sblksize;

Modified: store/trunk/cpp/lib/jrnl/rmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/rmgr.cpp	2008-04-08 12:08:21 UTC (rev 1858)
+++ store/trunk/cpp/lib/jrnl/rmgr.cpp	2008-04-08 14:20:25 UTC (rev 1859)
@@ -53,7 +53,7 @@
 
 rmgr::~rmgr()
 {
-    clean();
+    rmgr::clean();
 }
 
 void
@@ -88,8 +88,6 @@
 void
 rmgr::clean()
 {
-    // pmgr::clean();
-
     ::free(_fhdr_buffer);
     _fhdr_buffer = 0;
 

Modified: store/trunk/cpp/lib/jrnl/wmgr.cpp
===================================================================
--- store/trunk/cpp/lib/jrnl/wmgr.cpp	2008-04-08 12:08:21 UTC (rev 1858)
+++ store/trunk/cpp/lib/jrnl/wmgr.cpp	2008-04-08 14:20:25 UTC (rev 1859)
@@ -83,7 +83,7 @@
 
 wmgr::~wmgr()
 {
-    clean();
+    wmgr::clean();
 }
 
 void
@@ -909,10 +909,11 @@
 wmgr::initialize()
 {
     pmgr::initialize();
+    wmgr::clean();
     _num_jfiles = _jc->num_jfiles();
     if (::posix_memalign(&_fhdr_base_ptr, _sblksize, _sblksize * _num_jfiles))
     {
-        clean();
+        wmgr::clean();
         std::ostringstream oss;
         oss << "posix_memalign(): blksize=" << _sblksize << " size=" << _sblksize;
         oss << " errno=" << errno;
@@ -1069,8 +1070,6 @@
 void
 wmgr::clean()
 {
-    // pmgr::clean();
-    // clean up allocated memory here
     ::free(_fhdr_base_ptr);
     _fhdr_base_ptr = 0;