Added Jack Burton's DataIO-related stuff and cleaned things up a bit.

Several files managed to get left out of the build process; changes to
support.src fixed that.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@930 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/os/support/DataIO.h

@@ -1,18 +1,52 @@
-// Modified BeOS header. Just here to be able to compile and test BFile.
+//------------------------------------------------------------------------------
-// To be replaced by the OpenBeOS version to be provided by the IK Team.
+//	Copyright (c) 2001-2002, OpenBeOS
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		DataIO.h
+//	Author(s):		Jack Burton ([email protected])
+//	Description:	Pure virtual BDataIO and BPositioIO classes provide
+//					the protocol for Read()/Write()/Seek().
+//
+//					BMallocIO and BMemoryIO classes implement the protocol,
+//					as does BFile in the Storage Kit.
+//------------------------------------------------------------------------------
 
-#ifndef __sk_data_io_h__
+#ifndef	_DATA_IO_H
-#define __sk_data_io_h__
+#define	_DATA_IO_H
 
+// Standard Includes -----------------------------------------------------------
+
+// System Includes -------------------------------------------------------------
+#include <BeBuild.h>
 #include <SupportDefs.h>
 
-#ifdef USE_OPENBEOS_NAMESPACE
+// Project Includes ------------------------------------------------------------
-namespace OpenBeOS {
-#endif
 
-/*-----------------------------------------------------------------*/
+// Local Includes --------------------------------------------------------------
-/*------- BDataIO Class -------------------------------------------*/
 
+// Local Defines ---------------------------------------------------------------
+
+// Globals ---------------------------------------------------------------------
+
+
+// BDataIO Class ---------------------------------------------------------------
 class BDataIO {
 public:
 					BDataIO();
@@ -21,7 +55,7 @@ virtual				~BDataIO();
 virtual	ssize_t		Read(void *buffer, size_t size) = 0;
 virtual	ssize_t		Write(const void *buffer, size_t size) =0;
 
-/*----- Private or reserved ---------------*/
+// Private or reserved ----------------------
 private:
 
 virtual	void		_ReservedDataIO1();
@@ -29,14 +63,24 @@ virtual	void		_ReservedDataIO2();
 virtual	void		_ReservedDataIO3();
 virtual	void		_ReservedDataIO4();
 
+#if !_PR3_COMPATIBLE_
+virtual	void		_ReservedDataIO5();
+virtual	void		_ReservedDataIO6();
+virtual	void		_ReservedDataIO7();
+virtual	void		_ReservedDataIO8();
+virtual	void		_ReservedDataIO9();
+virtual	void		_ReservedDataIO10();
+virtual	void		_ReservedDataIO11();
+virtual	void		_ReservedDataIO12();
+#endif
+
 					BDataIO(const BDataIO &);
 		BDataIO		&operator=(const BDataIO &);
 
 		int32		_reserved[2];
 };
 
-/*---------------------------------------------------------------------*/
+// BPositionIO Class -----------------------------------------------------------
-/*------- BPositionIO Class -------------------------------------------*/
 
 class BPositionIO : public BDataIO {
 public:
@@ -54,16 +98,66 @@ virtual	off_t		Position() const = 0;
 
 virtual status_t	SetSize(off_t size);
 
-/*----- Private or reserved ---------------*/
+// Private or reserved ----------------------
 private:
 virtual	void		_ReservedPositionIO1();
 virtual	void		_ReservedPositionIO2();
 virtual void		_ReservedPositionIO3();
 virtual void		_ReservedPositionIO4();
 
+#if !_PR3_COMPATIBLE_
+virtual	void		_ReservedPositionIO5();
+virtual	void		_ReservedPositionIO6();
+virtual	void		_ReservedPositionIO7();
+virtual	void		_ReservedPositionIO8();
+virtual	void		_ReservedPositionIO9();
+virtual	void		_ReservedPositionIO10();
+virtual	void		_ReservedPositionIO11();
+virtual	void		_ReservedPositionIO12();
+#endif
+
 		int32		_reserved[2];
 };
 
+// BMallocIO Class -------------------------------------------------------------
+
+class BMallocIO : public BPositionIO {
+public:
+					BMallocIO();
+virtual				~BMallocIO();
+
+virtual	ssize_t		ReadAt(off_t pos, void *buffer, size_t size);
+virtual	ssize_t		WriteAt(off_t pos, const void *buffer, size_t size);
+
+virtual	off_t		Seek(off_t pos, uint32 seek_mode);
+virtual off_t		Position() const;
+virtual status_t	SetSize(off_t size);
+
+		void		SetBlockSize(size_t blocksize);
+
+const	void		*Buffer() const;
+		size_t		BufferLength() const;
+
+// Private or reserved ----------------------
+private:
+
+virtual	void		_ReservedMallocIO1();
+virtual	void		_ReservedMallocIO2();
+
+					BMallocIO(const BMallocIO &);
+		BMallocIO	&operator=(const BMallocIO &);
+
+		status_t	_Resize(off_t size);
+
+		size_t		fBlockSize;
+		size_t		fMallocSize;
+		size_t		fLength;
+		char		*fData;
+		off_t		fPosition;
+		int32		_reserved[1];
+};
+
+// BMemoryIO Class -------------------------------------------------------------
 
 class BMemoryIO : public BPositionIO {
 public:
@@ -79,7 +173,7 @@ virtual off_t		Position() const;
 
 virtual	status_t	SetSize(off_t size);
 
-/*----- Private or reserved ---------------*/
+// Private or reserved ----------------------
 private:
 virtual	void		_ReservedMemoryIO1();
 virtual	void		_ReservedMemoryIO2();
@@ -96,13 +190,14 @@ virtual	void		_ReservedMemoryIO2();
 		int32		_reserved[1];
 };
 
-/*-------------------------------------------------------------*/
+//------------------------------------------------------------------------------
-/*-------------------------------------------------------------*/
 
-#ifdef USE_OPENBEOS_NAMESPACE
+#endif // _DATA_IO_H
-}
-#endif
 
-#include <MallocIO.h>
+/*
+ * $Log $
+ *
+ * $Id  $
+ *
+ */
 
-#endif	// __sk_data_io_h__

src/kits/support/DataIO.cpp

@@ -1,10 +1,325 @@
-/******************************************************************************
+//------------------------------------------------------------------------------
-/
+//	Copyright (c) 2001-2002, OpenBeOS
-/	File:			DataIO.cpp
+//
-/
+//	Permission is hereby granted, free of charge, to any person obtaining a
-/	Description:	BMallocIO and BMemoryIO objects represent a buffer of
+//	copy of this software and associated documentation files (the "Software"),
-/					dynamically allocated memory.
+//	to deal in the Software without restriction, including without limitation
-/
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-/	Author:			Steve Vallee
+//	and/or sell copies of the Software, and to permit persons to whom the
-/
+//	Software is furnished to do so, subject to the following conditions:
-******************************************************************************/
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		DataIO.cpp
+//	Author(s):		Jack Burton ([email protected])
+//	Description:	Pure virtual BDataIO and BPositioIO classes provide
+//					the protocol for Read()/Write()/Seek().
+//
+//					BMallocIO and BMemoryIO classes implement the protocol,
+//					as does BFile in the Storage Kit.
+//------------------------------------------------------------------------------
+
+// Standard Includes -----------------------------------------------------------
+#include <cstdio>
+
+// System Includes -------------------------------------------------------------
+#include <DataIO.h>
+
+// Project Includes ------------------------------------------------------------
+
+// Local Includes --------------------------------------------------------------
+
+// Local Defines ---------------------------------------------------------------
+
+// Globals ---------------------------------------------------------------------
+
+
+// *** BDataIO ***
+BDataIO::BDataIO()
+{
+}
+
+
+BDataIO::~BDataIO()
+{
+}
+
+
+BDataIO::BDataIO(const BDataIO &)
+{
+	//Copying not allowed
+}
+
+
+BDataIO &
+BDataIO::operator=(const BDataIO &)
+{
+	//Copying not allowed
+	return *this;
+}
+
+void 
+BDataIO::_ReservedDataIO1(){}
+
+void 
+BDataIO::_ReservedDataIO2(){}
+
+void 
+BDataIO::_ReservedDataIO3(){}
+
+void 
+BDataIO::_ReservedDataIO4(){}
+
+#if !_PR3_COMPATIBLE_
+void 
+BDataIO::_ReservedDataIO5(){}
+
+void 
+BDataIO::_ReservedDataIO6(){}
+
+void 
+BDataIO::_ReservedDataIO7(){}
+
+void 
+BDataIO::_ReservedDataIO8(){}
+
+void 
+BDataIO::_ReservedDataIO9(){}
+
+void 
+BDataIO::_ReservedDataIO10(){}
+
+void 
+BDataIO::_ReservedDataIO11(){}
+
+void 
+BDataIO::_ReservedDataIO12(){}
+#endif
+
+// *** BPositionIO ***
+BPositionIO::BPositionIO()
+{
+}
+
+
+BPositionIO::~BPositionIO()
+{
+}
+
+
+ssize_t
+BPositionIO::Read(void *buffer, size_t size)
+{
+	off_t curPos = Position();
+	ssize_t result = ReadAt(curPos, buffer, size);
+	if (result > 0)
+		Seek(result, SEEK_CUR);
+	
+	return result;
+}
+
+
+ssize_t
+BPositionIO::Write(const void *buffer, size_t size)
+{
+	off_t curPos = Position();
+	ssize_t result = WriteAt(curPos, buffer, size);
+	if (result > 0)
+		Seek(result, SEEK_CUR);
+	
+	return result;
+}
+
+
+status_t
+BPositionIO::SetSize(off_t size)
+{
+	return B_ERROR;
+}
+
+void 
+BPositionIO::_ReservedPositionIO1(){}
+
+void 
+BPositionIO::_ReservedPositionIO2(){}
+
+void 
+BPositionIO::_ReservedPositionIO3(){}
+
+void 
+BPositionIO::_ReservedPositionIO4(){}
+
+#if !_PR3_COMPATIBLE_
+void 
+BPositionIO::_ReservedPositionIO5(){}
+
+void 
+BPositionIO::_ReservedPositionIO6(){}
+
+void 
+BPositionIO::_ReservedPositionIO7(){}
+
+void 
+BPositionIO::_ReservedPositionIO8(){}
+
+void 
+BPositionIO::_ReservedPositionIO9(){}
+
+void 
+BPositionIO::_ReservedPositionIO10(){}
+
+void 
+BPositionIO::_ReservedPositionIO11(){}
+
+void 
+BPositionIO::_ReservedPositionIO12(){}
+#endif
+
+// *** BMemoryIO ***
+BMemoryIO::BMemoryIO(void *p, size_t len)
+		:fReadOnly(false),
+		fBuf((char*)p),
+		fLen(len),
+		fPhys(len),
+		fPos(0)
+		
+{
+}
+
+
+BMemoryIO::BMemoryIO(const void *p, size_t len)
+		:fReadOnly(true),
+		fBuf((char*)p),
+		fLen(len),
+		fPhys(len),
+		fPos(0)
+{
+}
+
+
+BMemoryIO::~BMemoryIO()
+{
+}
+
+
+ssize_t
+BMemoryIO::ReadAt(off_t pos, void *buffer, size_t size)
+{
+	ssize_t result = size;
+	
+	if (pos < 0 || pos >= fLen)
+		result = 0;
+	else if (pos + size >= fLen)
+		result = fLen - pos;
+	
+	memcpy(buffer, fBuf + pos, result);
+	
+	return result;
+}
+
+
+ssize_t
+BMemoryIO::WriteAt(off_t pos, const void *buffer, size_t size)
+{	
+	if (fReadOnly)
+		return B_NOT_ALLOWED;
+	
+	ssize_t result = size;	
+	
+	if (pos < 0 || pos >= fPhys)
+		result = 0;
+	else if (pos + size >= fPhys)
+		result = fPhys - pos;
+	
+	if (pos + result > fLen)
+		fLen = pos + result;
+					
+	if (result > 0)
+		memcpy(fBuf + pos, buffer, result);
+	
+	return result;
+}
+
+
+off_t
+BMemoryIO::Seek(off_t position, uint32 seek_mode)
+{
+	switch (seek_mode) {
+		case SEEK_SET:
+			fPos = position;
+			break;
+		case SEEK_CUR:
+			fPos += position;
+			break;		
+		case SEEK_END:
+			fPos = fLen + position;
+			break;
+		default:
+			break;
+	}	
+	return fPos;
+}
+
+
+off_t
+BMemoryIO::Position() const
+{
+	return fPos;
+}
+
+
+status_t
+BMemoryIO::SetSize(off_t size)
+{
+	if (fReadOnly)
+		return B_NOT_ALLOWED;
+	
+	status_t err;
+	
+	if (size < 0 || size > fPhys)
+		err = B_ERROR;
+	else {
+		err = B_OK;
+		fLen = size;
+	}
+
+	return err;
+}
+
+
+BMemoryIO::BMemoryIO(const BMemoryIO &)
+{
+	//Copying not allowed
+}
+
+
+BMemoryIO &
+BMemoryIO::operator=(const BMemoryIO &)
+{
+	//Copying not allowed
+	return *this;
+}
+
+void 
+BMemoryIO::_ReservedMemoryIO1(){}
+
+void 
+BMemoryIO::_ReservedMemoryIO2(){}
+
+
+/*
+ * $Log $
+ *
+ * $Id  $
+ *
+ */
+

src/kits/support/MallocIO.cpp

@@ -1,13 +1,50 @@
-// MallocIO.cpp
+//------------------------------------------------------------------------------
-// Just here to be able to compile and test BResources.
+//	Copyright (c) 2001-2002, OpenBeOS
-// To be replaced by the OpenBeOS version to be provided by the IK Team.
+//
+//	Permission is hereby granted, free of charge, to any person obtaining a
+//	copy of this software and associated documentation files (the "Software"),
+//	to deal in the Software without restriction, including without limitation
+//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+//	and/or sell copies of the Software, and to permit persons to whom the
+//	Software is furnished to do so, subject to the following conditions:
+//
+//	The above copyright notice and this permission notice shall be included in
+//	all copies or substantial portions of the Software.
+//
+//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+//	DEALINGS IN THE SOFTWARE.
+//
+//	File Name:		DataIO.h
+//	Author(s):		The Storage Kit team
+//	Description:	Pure virtual BDataIO and BPositioIO classes provide
+//					the protocol for Read()/Write()/Seek().
+//
+//					BMallocIO and BMemoryIO classes implement the protocol,
+//					as does BFile in the Storage Kit.
+//------------------------------------------------------------------------------
 
+// Standard Includes -----------------------------------------------------------
 #include <algobase.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "MallocIO.h"
+// System Includes -------------------------------------------------------------
+#include <DataIO.h>
+
+// Project Includes ------------------------------------------------------------
+
+// Local Includes --------------------------------------------------------------
+
+// Local Defines ---------------------------------------------------------------
+
+// Globals ---------------------------------------------------------------------
+
 
 // constructor
 BMallocIO::BMallocIO()
@@ -174,3 +211,11 @@ BMallocIO::operator=(const BMallocIO &)
 	return *this;
 }
 
+
+/*
+ * $Log $
+ *
+ * $Id  $
+ *
+ */
+

src/kits/support/support.src

@@ -1,7 +1,11 @@
 SUPPORT_KIT_SOURCE =
 	Archivable.cpp
+	BlockCache.cpp
 	DataIO.cpp
+	Flattenable.cpp
+	List.cpp
 	Locker.cpp
+	MallocIO.cpp
 	StopWatch.cpp
 	String.cpp
 ;