vitalif
/
zbackup
mirror of https://github.com/vitalif/zbackup
1
0
Fork 0
Code Issues Releases Wiki Activity

clean up

master
benny 2013-10-03 10:24:47 +02:00
parent 072bec5071
commit 3d27b516f1
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -10,7 +10,6 @@ if( ${CMAKE_VERSION} VERSION_LESS "2.8.9" )
endif()
set( CMAKE_BUILD_TYPE Release )
#set( CMAKE_BUILD_TYPE Debug )
find_package( ZLIB REQUIRED )
include_directories( ${ZLIB_INCLUDE_DIRS} )

1
chunk_storage.cc
View File

@ -108,7 +108,6 @@ void Writer::finishCurrentBundle()
// Wait for some compressors to finish if there are too many of them
Lock _( runningCompressorsMutex );
//printf("runningCompressors: %d\n", runningCompressors);
while ( runningCompressors >= maxCompressorsToRun )
runningCompressorsCondition.wait( runningCompressorsMutex );

13
compression.cc
View File

@ -497,9 +497,7 @@ bool LZO1X_1_Encoder::do_process_no_size( const char* data_in, size_t avail_in,
output_size = avail_out;
lzo_voidp wrkmem = compression->getWorkmem(LZO1X_1_MEM_COMPRESS);
int ret;
//DEBUG: for (int i=0;i<500;i++)
ret = lzo1x_1_compress( (const lzo_bytep) data_in, avail_in,
int ret = lzo1x_1_compress( (const lzo_bytep) data_in, avail_in,
(lzo_bytep) data_out, &output_size, wrkmem );
compression->giveBackWorkmem(wrkmem);
@ -508,15 +506,6 @@ bool LZO1X_1_Encoder::do_process_no_size( const char* data_in, size_t avail_in,
CHECK( ret >= LZO_E_OK, "lzo1x_1_compress failed (code %d)", ret );
//DEBUG
/*char* tmp = new char[avail_in+10];
size_t decompressed = avail_in+10;
ret = lzo1x_decompress_safe( (lzo_bytep) data_out, output_size, (lzo_bytep) tmp, &decompressed, NULL );
CHECK( ret >= LZO_E_OK, "decompressing immediately after compressing failed (code %d)", ret );
CHECK( avail_in == decompressed, "decompressed size is wrong: %lu != %lu", decompressed, avail_in );
CHECK( memcmp( tmp, data_in, avail_in ) == 0, "decompressed data is wrong" );
delete[] tmp;*/
return true;
}

2
compression.hh
View File

@ -56,7 +56,7 @@ public:
class iterator {
friend class Compression;
const Compression* const* ptr;
iterator(const Compression* const* ptr);
public: