Revert "Move ZlibDecompressor to libshared"

This reverts commit 9af2105. Conflicts: src/kits/package/Jamfile
haiku · Jun 18, 2014 · d2d1af8 · d2d1af8
1 parent 5cd75b5
commit d2d1af8
Show file tree

Hide file tree

Showing 37 changed files with 148 additions and 131 deletions.
diff --git a/.../build/os/package/hpkg/BufferDataOutput.h → headers/build/os/package/hpkg/DataOutput.h b/.../build/os/package/hpkg/BufferDataOutput.h → headers/build/os/package/hpkg/DataOutput.h
diff --git a/headers/build/private/package/hpkg/ZlibCompressionBase.h b/headers/build/private/package/hpkg/ZlibCompressionBase.h
@@ -0,0 +1 @@
+#include <../private/package/hpkg/ZlibCompressionBase.h>
diff --git a/headers/build/private/package/hpkg/ZlibDecompressor.h b/headers/build/private/package/hpkg/ZlibDecompressor.h
@@ -0,0 +1 @@
+#include <../private/package/hpkg/ZlibDecompressor.h>
diff --git a/headers/build/private/shared/ZlibCompressionBase.h b/headers/build/private/shared/ZlibCompressionBase.h
diff --git a/headers/build/private/shared/ZlibDecompressor.h b/headers/build/private/shared/ZlibDecompressor.h
diff --git a/headers/os/package/hpkg/BufferDataOutput.h → headers/os/package/hpkg/DataOutput.h b/headers/os/package/hpkg/BufferDataOutput.h → headers/os/package/hpkg/DataOutput.h
@@ -6,7 +6,6 @@
 #define _PACKAGE__HPKG__DATA_OUTPUT_H_
 
 
-#include <DataIO.h>
 #include <SupportDefs.h>
 
 
@@ -15,15 +14,21 @@ namespace BPackageKit {
 namespace BHPKG {
 
 
-class BBufferDataOutput : public BDataIO {
+class BDataOutput {
+public:
+	virtual						~BDataOutput();
+
+	virtual	status_t			WriteData(const void* buffer, size_t size) = 0;
+};
+
+
+class BBufferDataOutput : public BDataOutput {
 public:
 								BBufferDataOutput(void* buffer, size_t size);
 
 			size_t				BytesWritten() const { return fBytesWritten; }
 
-	virtual	status_t			Write(const void* buffer, size_t size);
-	virtual ssize_t				Read(void* buffer, size_t size)
-									{ return B_NOT_SUPPORTED; }
+	virtual	status_t			WriteData(const void* buffer, size_t size);
 
 private:
 			void*				fBuffer;

diff --git a/headers/os/package/hpkg/DataReader.h b/headers/os/package/hpkg/DataReader.h
@@ -9,14 +9,14 @@
 #include <SupportDefs.h>
 
 
-class BDataIO;
-
-
 namespace BPackageKit {
 
 namespace BHPKG {
 
 
+class BDataOutput;
+
+
 class BDataReader {
 public:
 	virtual						~BDataReader();
@@ -33,7 +33,7 @@ class BAbstractBufferedDataReader : public BDataReader {
 	virtual	status_t			ReadData(off_t offset, void* buffer,
 									size_t size);
 	virtual	status_t			ReadDataToOutput(off_t offset, size_t size,
-									BDataIO* output) = 0;
+									BDataOutput* output) = 0;
 };
 
 
@@ -73,7 +73,7 @@ class BBufferDataReader : public BAbstractBufferedDataReader {
 	virtual	status_t			ReadData(off_t offset, void* buffer,
 									size_t size);
 	virtual	status_t			ReadDataToOutput(off_t offset, size_t size,
-									BDataIO* output);
+									BDataOutput* output);
 
 private:
 			const void*			fData;

diff --git a/headers/private/package/hpkg/DataWriters.h b/headers/private/package/hpkg/DataWriters.h
@@ -7,7 +7,7 @@
 #define _PACKAGE__HPKG__PRIVATE__DATA_WRITERS_H_
 
 
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
 #include <package/hpkg/ZlibCompressor.h>
 
 
@@ -59,7 +59,7 @@ class FDDataWriter : public AbstractDataWriter {
 };
 
 
-class ZlibDataWriter : public AbstractDataWriter, private BDataIO {
+class ZlibDataWriter : public AbstractDataWriter, private BDataOutput {
 public:
 								ZlibDataWriter(AbstractDataWriter* dataWriter);
 
@@ -71,7 +71,7 @@ class ZlibDataWriter : public AbstractDataWriter, private BDataIO {
 
 private:
 	// BDataOutput
-	virtual	status_t			Write(const void* buffer, size_t size);
+	virtual	status_t			WriteData(const void* buffer, size_t size);
 
 private:
 			AbstractDataWriter*	fDataWriter;

diff --git a/headers/private/package/hpkg/PackageFileHeapAccessorBase.h b/headers/private/package/hpkg/PackageFileHeapAccessorBase.h
@@ -49,7 +49,7 @@ class PackageFileHeapAccessorBase : public BAbstractBufferedDataReader {
 
 	// BAbstractBufferedDataReader
 	virtual	status_t			ReadDataToOutput(off_t offset, size_t size,
-									BDataIO* output);
+									BDataOutput* output);
 
 public:
 	static	const size_t		kChunkSize = 64 * 1024;

diff --git a/headers/private/package/hpkg/WriterImplBase.h b/headers/private/package/hpkg/WriterImplBase.h
@@ -10,7 +10,7 @@
 
 #include <package/hpkg/HPKGDefsPrivate.h>
 
-#include <package/hpkg/BufferDataOutput.h>
+#include <package/hpkg/DataOutput.h>
 #include <package/hpkg/DataWriters.h>
 #include <package/hpkg/PackageWriter.h>
 #include <package/hpkg/Strings.h>

diff --git a/headers/private/shared/ZlibCompressionBase.h → ...rivate/package/hpkg/ZlibCompressionBase.h b/headers/private/shared/ZlibCompressionBase.h → ...rivate/package/hpkg/ZlibCompressionBase.h
@@ -2,13 +2,17 @@
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _PRIVATE__ZLIB_COMPRESSION_BASE_H_
-#define _PRIVATE__ZLIB_COMPRESSION_BASE_H_
+#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
+#define _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
 
 
 #include <SupportDefs.h>
 
 
+namespace BPackageKit {
+
+namespace BHPKG {
+
 namespace BPrivate {
 
 
@@ -20,4 +24,9 @@ class ZlibCompressionBase {
 
 }	// namespace BPrivate
 
-#endif	// _PRIVATE__ZLIB_COMPRESSION_BASE_H_
+}	// namespace BHPKG
+
+}	// namespace BPackageKit
+
+
+#endif	// _PACKAGE__HPKG__PRIVATE__ZLIB_COMPRESSION_BASE_H_
diff --git a/headers/private/package/hpkg/ZlibCompressor.h b/headers/private/package/hpkg/ZlibCompressor.h
@@ -8,23 +8,23 @@
 
 #include <zlib.h>
 
-#include <ZlibCompressionBase.h>
-
-
-class BDataIO;
+#include <package/hpkg/ZlibCompressionBase.h>
 
 
 namespace BPackageKit {
 
 namespace BHPKG {
 
 
+class BDataOutput;
+
+
 namespace BPrivate {
 
 
-class ZlibCompressor : public ::BPrivate::ZlibCompressionBase {
+class ZlibCompressor : public ZlibCompressionBase {
 public:
-								ZlibCompressor(BDataIO* output);
+								ZlibCompressor(BDataOutput* output);
 								~ZlibCompressor();
 
 			status_t			Init(int compressionLevel = Z_BEST_COMPRESSION);
@@ -39,7 +39,7 @@ class ZlibCompressor : public ::BPrivate::ZlibCompressionBase {
 
 private:
 			z_stream			fStream;
-			BDataIO*			fOutput;
+			BDataOutput*		fOutput;
 			bool				fStreamInitialized;
 };
 

diff --git a/headers/private/shared/ZlibDecompressor.h → ...s/private/package/hpkg/ZlibDecompressor.h b/headers/private/shared/ZlibDecompressor.h → ...s/private/package/hpkg/ZlibDecompressor.h
@@ -2,24 +2,29 @@
  * Copyright 2009, Ingo Weinhold, ingo_weinhold@gmx.de.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _PRIVATE__ZLIB_DECOMPRESSOR_H_
-#define _PRIVATE__ZLIB_DECOMPRESSOR_H_
+#ifndef _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
+#define _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
 
 
 #include <zlib.h>
 
-#include <ZlibCompressionBase.h>
+#include <package/hpkg/ZlibCompressionBase.h>
 
 
-class BDataIO;
+namespace BPackageKit {
+
+namespace BHPKG {
+
+
+class BDataOutput;
 
 
 namespace BPrivate {
 
 
 class ZlibDecompressor : public ZlibCompressionBase {
 public:
-								ZlibDecompressor(BDataIO* output);
+								ZlibDecompressor(BDataOutput* output);
 								~ZlibDecompressor();
 
 			status_t			Init();
@@ -34,12 +39,17 @@ class ZlibDecompressor : public ZlibCompressionBase {
 
 private:
 			z_stream			fStream;
-			BDataIO*			fOutput;
+			BDataOutput*		fOutput;
 			bool				fStreamInitialized;
 			bool				fFinished;
 };
 
 
 }	// namespace BPrivate
 
+}	// namespace BHPKG
+
+}	// namespace BPackageKit
+
+
 #endif	// _PACKAGE__HPKG__PRIVATE__ZLIB_DECOMPRESSOR_H_
diff --git a/src/add-ons/kernel/file_systems/packagefs/Jamfile b/src/add-ons/kernel/file_systems/packagefs/Jamfile
@@ -75,8 +75,8 @@ HAIKU_PACKAGE_FS_SHARED_SOURCES =
 
 HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
 	BlockBufferPoolImpl.cpp
-	BufferDataOutput.cpp
 	BufferPool.cpp
+	DataOutput.cpp
 	DataReader.cpp
 	ErrorOutput.cpp
 	FDDataReader.cpp
@@ -91,6 +91,10 @@ HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES =
 	PackageFileHeapReader.cpp
 	PackageReaderImpl.cpp
 	ReaderImplBase.cpp
+
+	# compression
+	ZlibCompressionBase.cpp
+	ZlibDecompressor.cpp
 ;
 
 HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1 =
@@ -111,14 +115,6 @@ Includes
 
 local libSharedSources =
 	NaturalCompare.cpp
-
-	# compression
-	ZlibCompressionBase.cpp
-	ZlibDecompressor.cpp
-;
-
-local supportKitSources =
-	DataIO.cpp
 ;
 
 
@@ -129,7 +125,6 @@ KernelAddon packagefs
 	$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES)
 	$(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1)
 	$(libSharedSources)
-	$(supportKitSources)
 
 	: $(TARGET_KERNEL_LIBSUPC++) kernel_libz.a
 ;
@@ -143,5 +138,3 @@ SEARCH on [ FGristFiles $(HAIKU_PACKAGE_FS_PACKAGE_READER_SOURCES_V1) ]
 	+= [ FDirName $(HAIKU_TOP) src kits package hpkg v1 ] ;
 SEARCH on [ FGristFiles $(libSharedSources) ]
 	+= [ FDirName $(HAIKU_TOP) src kits shared ] ;
-SEARCH on [ FGristFiles $(supportKitSources) ]
-	+= [ FDirName $(HAIKU_TOP) src kits support ] ;
diff --git a/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp b/src/add-ons/kernel/file_systems/packagefs/package/CachedDataReader.cpp
@@ -31,7 +31,7 @@ page_physical_number_less(const vm_page* a, const vm_page* b)
 // #pragma mark - PagesDataOutput
 
 
-struct CachedDataReader::PagesDataOutput : public BDataIO {
+struct CachedDataReader::PagesDataOutput : public BDataOutput {
 	PagesDataOutput(vm_page** pages, size_t pageCount)
 		:
 		fPages(pages),
@@ -40,7 +40,7 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
 	{
 	}
 
-	virtual status_t Write(const void* buffer, size_t size)
+	virtual status_t WriteData(const void* buffer, size_t size)
 	{
 		while (size > 0) {
 			if (fPageCount == 0)
@@ -67,11 +67,6 @@ struct CachedDataReader::PagesDataOutput : public BDataIO {
 		return B_OK;
 	}
 
-	virtual ssize_t Read(void* buffer, size_t size)
-	{
-		return B_NOT_SUPPORTED;
-	}
-
 private:
 	vm_page**	fPages;
 	size_t		fPageCount;
@@ -137,7 +132,7 @@ CachedDataReader::ReadData(off_t offset, void* buffer, size_t size)
 
 status_t
 CachedDataReader::ReadDataToOutput(off_t offset, size_t size,
-	BDataIO* output)
+	BDataOutput* output)
 {
 	if (offset > fCache->virtual_end
 		|| (off_t)size > fCache->virtual_end - offset) {
@@ -173,7 +168,7 @@ CachedDataReader::ReadDataToOutput(off_t offset, size_t size,
 
 status_t
 CachedDataReader::_ReadCacheLine(off_t lineOffset, size_t lineSize,
-	off_t requestOffset, size_t requestLength, BDataIO* output)
+	off_t requestOffset, size_t requestLength, BDataOutput* output)
 {
 	PRINT("CachedDataReader::_ReadCacheLine(%" B_PRIdOFF ", %zu, %" B_PRIdOFF
 		", %zu, %p\n", lineOffset, lineSize, requestOffset, requestLength,
@@ -371,7 +366,7 @@ CachedDataReader::_CachePages(vm_page** pages, size_t firstPage,
 */
 status_t
 CachedDataReader::_WritePages(vm_page** pages, size_t pagesRelativeOffset,
-	size_t requestLength, BDataIO* output)
+	size_t requestLength, BDataOutput* output)
 {
 	PRINT("%p->CachedDataReader::_WritePages(%" B_PRIuSIZE ", %" B_PRIuSIZE
 		", %p)\n", this, pagesRelativeOffset, requestLength, output);
@@ -394,7 +389,7 @@ CachedDataReader::_WritePages(vm_page** pages, size_t pagesRelativeOffset,
 
 		// write the page's data
 		size_t toCopy = std::min(B_PAGE_SIZE - inPageOffset, requestLength);
-		error = output->Write((uint8*)(address + inPageOffset), toCopy);
+		error = output->WriteData((uint8*)(address + inPageOffset), toCopy);
 
 		// unmap the page
 		vm_put_physical_page(address, handle);