[haiku-commits] r40394 - in haiku/trunk: headers/os/package/hpkg headers/private/package/hpkg src/kits/package src/kits/package/hpkg
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 8 Feb 2011 21:15:50 +0100 (CET)
Author: zooey
Date: 2011-02-08 21:15:50 +0100 (Tue, 08 Feb 2011)
New Revision: 40394
Changeset: http://dev.haiku-os.org/changeset/40394
Modified:
haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h
haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
haiku/trunk/src/kits/package/Jamfile
haiku/trunk/src/kits/package/hpkg/RepositoryWriter.cpp
haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp
Log:
* add stubbed RepositoryWriter to build
Modified: haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h
===================================================================
--- haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h 2011-02-08
19:50:36 UTC (rev 40393)
+++ haiku/trunk/headers/os/package/hpkg/RepositoryWriter.h 2011-02-08
20:15:50 UTC (rev 40394)
@@ -6,13 +6,18 @@
#define _PACKAGE__HPKG__REPOSITORY_WRITER_H_
-#include <SupportDefs.h>
-
#include <package/hpkg/ErrorOutput.h>
+class BEntry;
+
+
namespace BPackageKit {
+
+class BPackageInfo;
+
+
namespace BHPKG {
@@ -30,7 +35,7 @@
virtual void OnPackageAdded(
const
BPackageInfo& packageInfo) = 0;
- virtual void OnPackageAttributesSizeInfo(
+ virtual void
OnPackageAttributesSizeInfo(uint32 stringCount,
uint32
uncompressedSize) = 0;
virtual void OnRepositorySizeInfo(uint32
headerSize,
uint32
packageAttributesSize,
@@ -46,7 +51,7 @@
~BRepositoryWriter();
status_t Init(const char*
fileName);
- status_t AddPackage(const
BPackageInfo& packageInfo);
+ status_t AddPackage(const
BEntry& packageEntry);
status_t Finish();
private:
Modified: haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
===================================================================
--- haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
2011-02-08 19:50:36 UTC (rev 40393)
+++ haiku/trunk/headers/private/package/hpkg/RepositoryWriterImpl.h
2011-02-08 20:15:50 UTC (rev 40394)
@@ -6,11 +6,9 @@
#define _PACKAGE__HPKG__PRIVATE__REPOSITORY_WRITER_IMPL_H_
-#include <util/DoublyLinkedList.h>
-#include <util/OpenHashTable.h>
+#include <Entry.h>
-#include <package/PackageInfo.h>
-#include <package/hpkg/Strings.h>
+#include <package/hpkg/RepositoryWriter.h>
#include <package/hpkg/WriterImplBase.h>
@@ -35,17 +33,19 @@
~RepositoryWriterImpl();
status_t Init(const char*
fileName);
- status_t AddPackage(const
BPackageInfo& packageInfo);
+ status_t AddPackage(const
BEntry& packageEntry);
status_t Finish();
private:
status_t _Init(const char*
fileName);
- status_t _AddPackage(const
BPackageInfo& packageInfo);
+ status_t _AddPackage(const
BEntry& packageEntry);
status_t _Finish();
+ off_t _WritePackageAttributes(
+
hpkg_repo_header& header);
+
private:
BRepositoryWriterListener* fListener;
-
};
Modified: haiku/trunk/src/kits/package/Jamfile
===================================================================
--- haiku/trunk/src/kits/package/Jamfile 2011-02-08 19:50:36 UTC (rev
40393)
+++ haiku/trunk/src/kits/package/Jamfile 2011-02-08 20:15:50 UTC (rev
40394)
@@ -25,6 +25,7 @@
PackageReaderImpl.cpp
PackageWriter.cpp
PackageWriterImpl.cpp
+ RepositoryWriterImpl.cpp
Strings.cpp
WriterImplBase.cpp
Modified: haiku/trunk/src/kits/package/hpkg/RepositoryWriter.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/RepositoryWriter.cpp 2011-02-08
19:50:36 UTC (rev 40393)
+++ haiku/trunk/src/kits/package/hpkg/RepositoryWriter.cpp 2011-02-08
20:15:50 UTC (rev 40394)
@@ -40,12 +40,12 @@
status_t
-BRepositoryWriter::AddPackage(const BPackageInfo& packageInfo)
+BRepositoryWriter::AddPackage(const BEntry& packageEntry)
{
if (fImpl == NULL)
return B_NO_INIT;
- return fImpl->AddPackage(packageInfo);
+ return fImpl->AddPackage(packageEntry);
}
Modified: haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp
===================================================================
--- haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp 2011-02-08
19:50:36 UTC (rev 40393)
+++ haiku/trunk/src/kits/package/hpkg/RepositoryWriterImpl.cpp 2011-02-08
20:15:50 UTC (rev 40394)
@@ -6,30 +6,16 @@
#include <package/hpkg/RepositoryWriterImpl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
#include <algorithm>
#include <new>
#include <ByteOrder.h>
-#include <Entry.h>
-#include <fs_attr.h>
-#include <AutoDeleter.h>
-
#include <package/hpkg/haiku_package.h>
-#include <package/hpkg/DataOutput.h>
-#include <package/hpkg/DataReader.h>
-#include <package/hpkg/ZlibCompressor.h>
+#include <package/PackageInfo.h>
-using BPrivate::FileDescriptorCloser;
-
-
namespace BPackageKit {
namespace BHPKG {
@@ -39,32 +25,14 @@
RepositoryWriterImpl::RepositoryWriterImpl(BRepositoryWriterListener* listener)
:
- fListener(listener),
- fFileName(NULL),
- fFD(-1),
- fFinished(false),
- fDataWriter(NULL),
- fCachedStrings(NULL)
+ WriterImplBase(listener),
+ fListener(listener)
{
}
RepositoryWriterImpl::~RepositoryWriterImpl()
{
- if (fCachedStrings != NULL) {
- CachedString* cachedString = fCachedStrings->Clear(true);
- while (cachedString != NULL) {
- CachedString* next = cachedString->next;
- delete cachedString;
- cachedString = next;
- }
- }
-
- if (fFD >= 0)
- close(fFD);
-
- if (!fFinished && fFileName != NULL)
- unlink(fFileName);
}
@@ -83,10 +51,10 @@
status_t
-RepositoryWriterImpl::AddPackage(const BPackageInfo& packageInfo)
+RepositoryWriterImpl::AddPackage(const BEntry& packageEntry)
{
try {
- return _RegisterPackage(packageInfo);
+ return _AddPackage(packageEntry);
} catch (status_t error) {
return error;
} catch (std::bad_alloc) {
@@ -113,29 +81,7 @@
status_t
RepositoryWriterImpl::_Init(const char* fileName)
{
- // create hash tables
- fCachedStrings = new CachedStringTable;
- if (fCachedStrings->Init() != B_OK)
- throw std::bad_alloc();
-
- // allocate data buffer
- fDataBufferSize = 2 * B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB;
- fDataBuffer = malloc(fDataBufferSize);
- if (fDataBuffer == NULL)
- throw std::bad_alloc();
-
- // open file
- fFD = open(fileName, O_WRONLY | O_CREAT | O_TRUNC,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
- if (fFD < 0) {
- fListener->PrintError("Failed to open package file \"%s\":
%s\n",
- fileName, strerror(errno));
- return errno;
- }
-
- fFileName = fileName;
-
- return B_OK;
+ return WriterImplBase::Init(fileName, "repository");
}
@@ -144,14 +90,10 @@
{
hpkg_repo_header header;
- // write the cached strings and package attributes
- _WriteCachedStrings();
- WritePackageAttributes(header);
+ // write package attributes
+ off_t totalSize = _WritePackageAttributes(header);
- off_t totalSize = fHeapEnd;
-
- fListener->OnPackageSizeInfo(sizeof(hpkg_header), heapSize,
- B_BENDIAN_TO_HOST_INT64(header.toc_length_compressed),
+ fListener->OnRepositorySizeInfo(sizeof(header),
B_BENDIAN_TO_HOST_INT32(header.attributes_length_compressed),
totalSize);
@@ -164,425 +106,59 @@
header.total_size = B_HOST_TO_BENDIAN_INT64(totalSize);
// write the header
- _WriteBuffer(&header, sizeof(header), 0);
+ WriteBuffer(&header, sizeof(header), 0);
- fFinished = true;
+ SetFinished(true);
return B_OK;
}
status_t
-RepositoryWriterImpl::_AddPackage(const BPackageInfo& packageInfo)
+RepositoryWriterImpl::_AddPackage(const BEntry& packageEntry)
{
-// fPackageInfos.AddItem(packageInfo);
+// TODO!
return B_OK;
}
-void
-RepositoryWriterImpl::_WriteTOC(hpkg_header& header)
+off_t
+RepositoryWriterImpl::_WritePackageAttributes(hpkg_repo_header& header)
{
- // prepare the writer (zlib writer on top of a file writer)
- off_t startOffset = fHeapEnd;
- FDDataWriter realWriter(fFD, startOffset, fListener);
+ // write the package attributes (zlib writer on top of a file writer)
+ off_t startOffset = sizeof(header);
+ FDDataWriter realWriter(FD(), startOffset, fListener);
ZlibDataWriter zlibWriter(&realWriter);
- fDataWriter = &zlibWriter;
+ SetDataWriter(&zlibWriter);
zlibWriter.Init();
- // write the sections
- uint64 uncompressedAttributeTypesSize;
- uint64 uncompressedStringsSize;
- uint64 uncompressedMainSize;
- int32 cachedStringsWritten = _WriteTOCSections(
- uncompressedAttributeTypesSize, uncompressedStringsSize,
- uncompressedMainSize);
+ // write cached strings and package attributes tree
+ uint32 stringsLengthUncompressed;
+ uint32 stringsCount = WritePackageAttributes(PackageAttributes(),
+ stringsLengthUncompressed);
- // finish the writer
zlibWriter.Finish();
- fHeapEnd = realWriter.Offset();
- fDataWriter = NULL;
+ off_t endOffset = realWriter.Offset();
+ SetDataWriter(NULL);
- off_t endOffset = fHeapEnd;
-
- fListener->OnTOCSizeInfo(uncompressedAttributeTypesSize,
- uncompressedStringsSize, uncompressedMainSize,
+ fListener->OnPackageAttributesSizeInfo(stringsCount,
zlibWriter.BytesWritten());
// update the header
-
- // TOC
- header.toc_compression =
B_HOST_TO_BENDIAN_INT32(B_HPKG_COMPRESSION_ZLIB);
- header.toc_length_compressed = B_HOST_TO_BENDIAN_INT64(
- endOffset - startOffset);
- header.toc_length_uncompressed = B_HOST_TO_BENDIAN_INT64(
- zlibWriter.BytesWritten());
-
- header.toc_strings_length = B_HOST_TO_BENDIAN_INT64(
- uncompressedStringsSize);
- header.toc_strings_count =
B_HOST_TO_BENDIAN_INT64(cachedStringsWritten);
-}
-
-
-int32
-RepositoryWriterImpl::_WriteTOCSections(uint64& _attributeTypesSize,
- uint64& _stringsSize, uint64& _mainSize)
-{
- // write the attribute type abbreviations
- uint64 attributeTypesOffset = fDataWriter->BytesWritten();
- _WriteAttributeTypes();
-
- // write the cached strings
- uint64 cachedStringsOffset = fDataWriter->BytesWritten();
- int32 cachedStringsWritten = _WriteCachedStrings();
-
- // write the main TOC section
- uint64 mainOffset = fDataWriter->BytesWritten();
- _WriteAttributeChildren(fRootAttribute);
-
- _attributeTypesSize = cachedStringsOffset - attributeTypesOffset;
- _stringsSize = mainOffset - cachedStringsOffset;
- _mainSize = fDataWriter->BytesWritten() - mainOffset;
-
- return cachedStringsWritten;
-}
-
-
-void
-RepositoryWriterImpl::_WritePackageAttributes(hpkg_header& header)
-{
- // write the package attributes (zlib writer on top of a file writer)
- off_t startOffset = fHeapEnd;
- FDDataWriter realWriter(fFD, startOffset, fListener);
- ZlibDataWriter zlibWriter(&realWriter);
- fDataWriter = &zlibWriter;
- zlibWriter.Init();
-
- // name
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_NAME, B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(fPackageInfo.Name().String());
-
- // summary
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_SUMMARY, B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(fPackageInfo.Summary().String());
-
- // description
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_DESCRIPTION,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(fPackageInfo.Description().String());
-
- // vendor
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_VENDOR, B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(fPackageInfo.Vendor().String());
-
- // packager
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_PACKAGER, B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(fPackageInfo.Packager().String());
-
- // architecture
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_ARCHITECTURE, B_HPKG_ATTRIBUTE_TYPE_UINT,
- B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT, 0));
- _Write<uint8>(fPackageInfo.Architecture());
-
- // version
- _WritePackageVersion(fPackageInfo.Version());
-
- // copyright list
- const BObjectList<BString>& copyrightList =
fPackageInfo.CopyrightList();
- for (int i = 0; i < copyrightList.CountItems(); ++i) {
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_COPYRIGHT,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(copyrightList.ItemAt(i)->String());
- }
-
- // license list
- const BObjectList<BString>& licenseList = fPackageInfo.LicenseList();
- for (int i = 0; i < licenseList.CountItems(); ++i) {
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_LICENSE,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(licenseList.ItemAt(i)->String());
- }
-
- // provides list
- const BObjectList<BPackageResolvable>& providesList
- = fPackageInfo.ProvidesList();
- for (int i = 0; i < providesList.CountItems(); ++i) {
- BPackageResolvable* resolvable = providesList.ItemAt(i);
- bool hasVersion = resolvable->Version().InitCheck() == B_OK;
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_PROVIDES_TYPE,
B_HPKG_ATTRIBUTE_TYPE_UINT,
- B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT, 0));
- _Write<uint8>((uint8)resolvable->Type());
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_PROVIDES,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, hasVersion));
- _WriteString(resolvable->Name().String());
- if (hasVersion) {
- _WritePackageVersion(resolvable->Version());
- _Write<uint8>(0);
- }
- }
-
- // requires list
- _WritePackageResolvableExpressionList(fPackageInfo.RequiresList(),
- HPKG_PACKAGE_ATTRIBUTE_REQUIRES);
-
- // supplements list
- _WritePackageResolvableExpressionList(fPackageInfo.SupplementsList(),
- HPKG_PACKAGE_ATTRIBUTE_SUPPLEMENTS);
-
- // conflicts list
- _WritePackageResolvableExpressionList(fPackageInfo.ConflictsList(),
- HPKG_PACKAGE_ATTRIBUTE_CONFLICTS);
-
- // freshens list
- _WritePackageResolvableExpressionList(fPackageInfo.FreshensList(),
- HPKG_PACKAGE_ATTRIBUTE_FRESHENS);
-
- // replaces list
- const BObjectList<BString>& replacesList = fPackageInfo.ReplacesList();
- for (int i = 0; i < replacesList.CountItems(); ++i) {
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_REPLACES,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(replacesList.ItemAt(i)->String());
- }
-
- _Write<uint8>(0);
-
- zlibWriter.Finish();
- fHeapEnd = realWriter.Offset();
- fDataWriter = NULL;
-
- off_t endOffset = fHeapEnd;
-
- fListener->OnPackageAttributesSizeInfo(zlibWriter.BytesWritten());
-
- // update the header
header.attributes_compression
= B_HOST_TO_BENDIAN_INT32(B_HPKG_COMPRESSION_ZLIB);
header.attributes_length_compressed
= B_HOST_TO_BENDIAN_INT32(endOffset - startOffset);
header.attributes_length_uncompressed
= B_HOST_TO_BENDIAN_INT32(zlibWriter.BytesWritten());
-}
+ header.attributes_strings_count = B_HOST_TO_BENDIAN_INT32(stringsCount);
+ header.attributes_strings_length
+ = B_HOST_TO_BENDIAN_INT32(stringsLengthUncompressed);
-
-void
-RepositoryWriterImpl::_WritePackageVersion(const BPackageVersion& version)
-{
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_VERSION_MAJOR,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(version.Major());
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_VERSION_MINOR,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(version.Minor());
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_VERSION_MICRO,
B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, 0));
- _WriteString(version.Micro());
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_VERSION_RELEASE,
B_HPKG_ATTRIBUTE_TYPE_UINT,
- B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT, 0));
- _Write<uint8>(version.Release());
+ return endOffset;
}
-void
-RepositoryWriterImpl::_WritePackageResolvableExpressionList(
- const BObjectList<BPackageResolvableExpression>& list, uint8 id)
-{
- for (int i = 0; i < list.CountItems(); ++i) {
- BPackageResolvableExpression* resolvableExpr = list.ItemAt(i);
- bool hasVersion = resolvableExpr->Version().InitCheck() == B_OK;
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- id, B_HPKG_ATTRIBUTE_TYPE_STRING,
- B_HPKG_ATTRIBUTE_ENCODING_STRING_INLINE, hasVersion));
- _WriteString(resolvableExpr->Name().String());
- if (hasVersion) {
- _WriteUnsignedLEB128(HPKG_PACKAGE_ATTRIBUTE_TAG_COMPOSE(
- HPKG_PACKAGE_ATTRIBUTE_RESOLVABLE_OPERATOR,
- B_HPKG_ATTRIBUTE_TYPE_UINT,
B_HPKG_ATTRIBUTE_ENCODING_INT_8_BIT,
- 0));
- _Write<uint8>(resolvableExpr->Operator());
- _WritePackageVersion(resolvableExpr->Version());
- _Write<uint8>(0);
- }
- }
-}
-
-
-void
-RepositoryWriterImpl::_WriteUnsignedLEB128(uint64 value)
-{
- uint8 bytes[10];
- int32 count = 0;
- do {
- uint8 byte = value & 0x7f;
- value >>= 7;
- bytes[count++] = byte | (value != 0 ? 0x80 : 0);
- } while (value != 0);
-
- fDataWriter->WriteDataThrows(bytes, count);
-}
-
-
-void
-RepositoryWriterImpl::_WriteBuffer(const void* buffer, size_t size, off_t
offset)
-{
- ssize_t bytesWritten = pwrite(fFD, buffer, size, offset);
- if (bytesWritten < 0) {
- fListener->PrintError(
- "_WriteBuffer(%p, %lu) failed to write data: %s\n",
buffer, size,
- strerror(errno));
- throw status_t(errno);
- }
- if ((size_t)bytesWritten != size) {
- fListener->PrintError(
- "_WriteBuffer(%p, %lu) failed to write all data\n",
buffer, size);
- throw status_t(B_ERROR);
- }
-}
-
-
-CachedString*
-RepositoryWriterImpl::_GetCachedString(const char* value)
-{
- CachedString* string = fCachedStrings->Lookup(value);
- if (string != NULL) {
- string->usageCount++;
- return string;
- }
-
- string = new CachedString;
- if (!string->Init(value)) {
- delete string;
- throw std::bad_alloc();
- }
-
- fCachedStrings->Insert(string);
- return string;
-}
-
-
-status_t
-RepositoryWriterImpl::_WriteZlibCompressedData(BDataReader& dataReader, off_t
size,
- uint64 writeOffset, uint64& _compressedSize)
-{
- // Use zlib compression only for data large enough.
- if (size < kZlibCompressionSizeThreshold)
- return B_BAD_VALUE;
-
- // fDataBuffer is 2 * B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB, so split it
into
- // two halves we can use for reading and compressing
- const size_t chunkSize = B_HPKG_DEFAULT_DATA_CHUNK_SIZE_ZLIB;
- uint8* inputBuffer = (uint8*)fDataBuffer;
- uint8* outputBuffer = (uint8*)fDataBuffer + chunkSize;
-
- // account for the offset table
- uint64 chunkCount = (size + (chunkSize - 1)) / chunkSize;
- off_t offsetTableOffset = writeOffset;
- uint64* offsetTable = NULL;
- if (chunkCount > 1) {
- offsetTable = new uint64[chunkCount - 1];
- writeOffset = offsetTableOffset + (chunkCount - 1) *
sizeof(uint64);
- }
- ArrayDeleter<uint64> offsetTableDeleter(offsetTable);
-
- const uint64 dataOffset = writeOffset;
- const uint64 dataEndLimit = offsetTableOffset + size;
-
- // read the data, compress them and write them to the heap
- off_t readOffset = 0;
- off_t remainingSize = size;
- uint64 chunkIndex = 0;
- while (remainingSize > 0) {
- // read data
- size_t toCopy = std::min(remainingSize, (off_t)chunkSize);
- status_t error = dataReader.ReadData(readOffset, inputBuffer,
toCopy);
- if (error != B_OK) {
- fListener->PrintError("Failed to read data: %s\n",
strerror(error));
- return error;
- }
-
- // compress
- size_t compressedSize;
- error = ZlibCompressor::CompressSingleBuffer(inputBuffer,
toCopy,
- outputBuffer, toCopy, compressedSize);
-
- const void* writeBuffer;
- size_t bytesToWrite;
- if (error == B_OK) {
- writeBuffer = outputBuffer;
- bytesToWrite = compressedSize;
- } else {
- if (error != B_BUFFER_OVERFLOW)
- return error;
- writeBuffer = inputBuffer;
- bytesToWrite = toCopy;
- }
-
- // check the total compressed data size
- if (writeOffset + bytesToWrite >= dataEndLimit)
- return B_BUFFER_OVERFLOW;
-
- if (chunkIndex > 0)
- offsetTable[chunkIndex - 1] = writeOffset - dataOffset;
-
- // write to heap
- ssize_t bytesWritten = pwrite(fFD, writeBuffer, bytesToWrite,
- writeOffset);
- if (bytesWritten < 0) {
- fListener->PrintError("Failed to write data: %s\n",
- strerror(errno));
- return errno;
- }
- if ((size_t)bytesWritten != bytesToWrite) {
- fListener->PrintError("Failed to write all data\n");
- return B_ERROR;
- }
-
- remainingSize -= toCopy;
- readOffset += toCopy;
- writeOffset += bytesToWrite;
- chunkIndex++;
- }
-
- // write the offset table
- if (chunkCount > 1) {
- size_t bytesToWrite = (chunkCount - 1) * sizeof(uint64);
- ssize_t bytesWritten = pwrite(fFD, offsetTable, bytesToWrite,
- offsetTableOffset);
- if (bytesWritten < 0) {
- fListener->PrintError("Failed to write data: %s\n",
- strerror(errno));
- return errno;
- }
- if ((size_t)bytesWritten != bytesToWrite) {
- fListener->PrintError("Failed to write all data\n");
- return B_ERROR;
- }
- }
-
- _compressedSize = writeOffset - offsetTableOffset;
- return B_OK;
-}
-
-
} // namespace BPrivate
} // namespace BHPKG
Other related posts:
- » [haiku-commits] r40394 - in haiku/trunk: headers/os/package/hpkg headers/private/package/hpkg src/kits/package src/kits/package/hpkg - zooey
