add debug output

Author: mxmlnkn

Diff for: src/GzipFile.cpp

@@ -6,6 +6,7 @@
 
 #include "Debug.h"
 #include "FileHandle.h"
+#include "GzipReader.h"
 #include "PathUtils.h"
 
 

Diff for: src/GzipFile.h

@@ -3,7 +3,6 @@
 #include "Block.h"
 #include "Buffer.h"
 #include "CompressedFile.h"
-#include "GzipReader.h"
 
 
 class GzipFile : public IndexedCompFile
@@ -39,7 +38,7 @@ class GzipFile : public IndexedCompFile
                     Block*      b ) override; // True unless EOF
 
     void writeBlock( FileHandle&  fh,
-                             const Block *b ) const override;
+                     const Block *b ) const override;
 
 public:
     static const size_t WindowSize;

Diff for: src/GzipReader.cpp

@@ -163,8 +163,6 @@ GzipBlockReader::GzipBlockReader( const FileHandle& fh,
 
 void SavingGzipReader::save()
 {
-    DEBUG( "%s start", __func__ );
-
     if ( !mSave ) {
         mSave = new PositionedGzipReader( mFH );
     }
@@ -187,8 +185,6 @@ void SavingGzipReader::save()
 
     mInitOutPos = mSave->opos();
     mOutBytes = 0;
-
-    DEBUG( "%s end", __func__ );
 }
 
 void SavingGzipReader::restore()

Diff for: src/GzipReader.h

@@ -72,10 +72,18 @@ class GzipReaderBase
     void throwEx( const std::string& s,
                   int                err );
 
-    void resetOutBuf()
+    inline void resetOutBuf()
     {
         mStream.next_out = &outBuf()[0];
         mStream.avail_out = outBuf().size();
+
+        if ( mStream.next_out == nullptr ) {
+            std::cerr << "Output buffer location is null. Can't work with this!\n";
+        }
+
+        if ( mStream.avail_out == 0 ) {
+            std::cerr << "Available outbut buffer is empty. Can't work with this!\n";
+        }
     }
 
     /** only used by GzipBlockReader */
@@ -84,7 +92,7 @@ class GzipReaderBase
     void prime( uint8_t byte,
                 size_t  bits );
 
-    int step( int flush = Z_BLOCK );   // One iteration of inflate
+    int step( int flush = Z_BLOCK ); // One iteration of inflate
 
     int stepThrow( int flush = Z_BLOCK );
 
@@ -94,15 +102,35 @@ class GzipReaderBase
 
     virtual size_t chunkSize() const;
 
-    virtual Wrapper wrapper() const { return Raw; }
+    inline virtual Wrapper wrapper() const { return Raw; }
 
     virtual Buffer& outBuf() = 0;
 
-    virtual void writeOut()
+    inline virtual void writeOut()
     {
         throw std::runtime_error( "out of space in gzip output buffer" );
     }
 
+    /** debug function */
+    inline static void
+    dumpStream( const z_stream& stream )
+    {
+        std::cerr
+        << "z_stream:\n"
+        << "  next input from                : " << (void*) stream.next_in << "\n"
+        << "  available input bytes          : " << stream.avail_in << "\n"
+        << "  input bytes already read       : " << stream.total_in << "\n"
+        << "\n"
+        << "  next output to                 : " << (void*) stream.next_out << "\n"
+        << "  remaining free output space    : " << stream.avail_out << "\n"
+        << "  output bytes already written   : " << stream.total_out << "\n"
+        << "\n"
+        << "  last error message             : " << ( stream.msg == nullptr ? "(null)" : stream.msg ) << "\n"
+        << "  data type guess                : " << stream.data_type << "\n"
+        << "  checksum for uncompressed data : " << stream.adler << "\n"
+        << "\n";
+    }
+
 public:
     GzipReaderBase();
 
@@ -123,6 +151,7 @@ class GzipReaderBase
     inline virtual void
     reset( Wrapper w )
     {
+        dumpStream( mStream );
         CHECK_ZLIB( inflateReset2( &mStream, w ) );
     };
 
@@ -304,6 +333,7 @@ class SavingGzipReader : public GzipReaderInternal::PositionedGzipReader
                       off_t       opos = 0 ) :
         PositionedGzipReader( fh, opos )
     {
+        std::cerr << "Resize buffer to " << windowSize() << "\n";
         mOutBuf.resize( windowSize() );
     }