Commit: 3e9d90eb2490ccf6bb74abed6e1defcac32a39b4 - BSON (git)

Aさん

Commit MetaInfo

• Revision: 3e9d90eb2490ccf6bb74abed6e1defcac32a39b4 (tree)
• Zeit: 2011-01-17 22:37:43
• Autor: berupon <berupon@gmai...>
• Commiter: berupon

Log Message

planning interface

Ändern Zusammenfassung

• add: File.cpp
• add: File.h
• add: IFile.h
• add: MemoryFile.cpp
• add: MemoryFile.h
• modified: bson/bson.h

Diff

--- /dev/null
+++ b/File.cpp
@@ -0,0 +1,60 @@
+#include "stdafx.h"
+#include "File.h"
+
+#include <io.h>
+#include <assert.h>
+#include <memory.h>
+#include <stdio.h>
+
+#include <windows.h>
+
+File::File(HANDLE hFile)
+	:
+	hFile_(hFile)
+{
+}
+
+File::File(FILE* pFile)
+{
+	hFile_ = (HANDLE) _get_osfhandle(_fileno(pFile));
+}
+
+BOOL File::Read(void* pBuffer, DWORD nNumberOfBytesToRead, DWORD& nNumberOfBytesRead)
+{
+	return ReadFile(hFile_, pBuffer, nNumberOfBytesToRead, &nNumberOfBytesRead, NULL);
+}
+
+BOOL File::Write(const void* pBuffer, DWORD nNumberOfBytesToWrite, DWORD& nNumberOfBytesWritten)
+{
+	return WriteFile(hFile_, pBuffer, nNumberOfBytesToWrite, &nNumberOfBytesWritten, NULL);
+}
+
+DWORD File::Seek(LONG lDistanceToMove, DWORD dwMoveMethod)
+{
+	return SetFilePointer(hFile_, lDistanceToMove, NULL, dwMoveMethod);
+}
+
+DWORD File::Tell() const
+{
+	/*
+		-- Reference --
+		http://nukz.net/reference/fileio/hh/winbase/filesio_3vhu.htm
+	*/
+	return SetFilePointer(
+		hFile_, // must have GENERIC_READ and/or GENERIC_WRITE 
+		0,     // do not move pointer 
+		NULL,  // hFile is not large enough to need this pointer 
+		FILE_CURRENT
+	);  // provides offset from current position 
+}
+
+DWORD File::Size() const
+{
+	return GetFileSize(hFile_, NULL);
+}
+
+BOOL File::Flush()
+{
+	return FlushFileBuffers(hFile_);
+}
+

--- /dev/null
+++ b/File.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "IFile.h"
+
+#include <stdio.h>
+
+class File : public IFile
+{
+public:
+	File(HANDLE hFile);
+
+	File(FILE* pFile);
+
+	BOOL Read(void* pBuffer, DWORD nNumberOfBytesToRead, DWORD& nNumberOfBytesRead);
+	
+	BOOL Write(const void* pBuffer, DWORD nNumberOfBytesToWrite, DWORD& nNumberOfBytesWritten);
+	
+	DWORD Seek(LONG lDistanceToMove, DWORD dwMoveMethod);
+	
+	DWORD Tell() const;
+	
+	DWORD Size() const;
+	
+	BOOL Flush();
+	
+	bool HasBuffer() const { return false; }
+	virtual const void* GetBuffer() const { return 0; }
+	
+private:
+	HANDLE hFile_;
+};
+

--- /dev/null
+++ b/IFile.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <windows.h>
+
+/*!
+
+概要
+	画像の入出力用に仮想的にFileを扱えるようにする
+	
+制限
+	非同期操作には対応しない
+	2GBまで
+	
+備考
+	CxImage by Davide Pizzolato (http://www.xdp.it/cximage.htm)	を参考にしました。
+
+	InterfaceをWindowsAPIのFile関数に似せています
+
+*/
+
+class IFile
+{
+public:
+	virtual BOOL Read(void* pBuffer, DWORD nNumberOfBytesToRead, DWORD& nNumberOfBytesRead) = 0;
+	virtual BOOL Write(const void* pBuffer, DWORD nNumberOfBytesToWrite, DWORD& nNumberOfBytesWritten) = 0;
+	virtual DWORD Seek(LONG lDistanceToMove, DWORD dwMoveMethod) = 0;
+	virtual DWORD Tell() const = 0;
+	virtual DWORD Size() const = 0;
+	virtual bool IsEof() const { return Tell() == Size(); }
+	virtual BOOL Flush() = 0;
+
+	virtual bool HasBuffer() const = 0;
+	virtual const void* GetBuffer() const = 0;
+};
+

--- /dev/null
+++ b/MemoryFile.cpp
@@ -0,0 +1,59 @@
+#include "stdafx.h"
+#include "MemoryFile.h"
+
+MemoryFile::MemoryFile(void* pBuff, size_t buffSize)
+	:
+	pBuff_(pBuff),
+	buffSize_(buffSize)
+{
+}
+
+BOOL MemoryFile::Read(void* pBuffer, DWORD nNumberOfBytesToRead, DWORD& nNumberOfBytesRead)
+{
+	DWORD fileSize = Size();
+	nNumberOfBytesRead = (fileSize < curPos_+nNumberOfBytesToRead) ? (fileSize - curPos_) : nNumberOfBytesToRead;
+	memcpy(pBuffer, (BYTE*)pBuff_+curPos_, nNumberOfBytesRead);
+	Seek(nNumberOfBytesRead, FILE_CURRENT);
+	return TRUE;
+}
+
+BOOL MemoryFile::Write(const void* pBuffer, DWORD nNumberOfBytesToWrite, DWORD& nNumberOfBytesWritten)
+{
+	memcpy((BYTE*)pBuff_+curPos_, pBuffer, nNumberOfBytesToWrite);
+	nNumberOfBytesWritten = nNumberOfBytesToWrite;
+	Seek(nNumberOfBytesToWrite, FILE_CURRENT);
+	return TRUE;
+}
+
+DWORD MemoryFile::Seek(LONG lDistanceToMove, DWORD dwMoveMethod)
+{
+	switch (dwMoveMethod) {
+	case FILE_BEGIN:
+		curPos_ = lDistanceToMove;
+		break;
+	case FILE_CURRENT:
+		curPos_ += lDistanceToMove;
+		break;
+	case FILE_END:
+		curPos_ += buffSize_ + lDistanceToMove;
+		break;
+	}
+	assert(0 <= curPos_ && curPos_ <= buffSize_);
+	return curPos_;
+}
+
+DWORD MemoryFile::Tell() const
+{
+	return curPos_;
+}
+
+DWORD MemoryFile::Size() const
+{
+	return buffSize_;
+}
+
+BOOL MemoryFile::Flush()
+{
+	return TRUE;
+}
+

--- /dev/null
+++ b/MemoryFile.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "IFile.h"
+
+class MemoryFile : public IFile
+{
+public:
+	MemoryFile(void* pBuff, size_t buffSize);
+
+	BOOL Read(void* pBuffer, DWORD nNumberOfBytesToRead, DWORD& nNumberOfBytesRead);
+	
+	BOOL Write(const void* pBuffer, DWORD nNumberOfBytesToWrite, DWORD& nNumberOfBytesWritten);
+	
+	DWORD Seek(LONG lDistanceToMove, DWORD dwMoveMethod);
+	
+	DWORD Tell() const;
+	
+	DWORD Size() const;
+	
+	BOOL Flush();
+
+	bool HasBuffer() const { return true; }
+	virtual const void* GetBuffer() const { return pBuff_; }
+	
+private:
+	void* pBuff_;
+	DWORD buffSize_;
+	
+	DWORD curPos_;
+};
+

--- a/bson/bson.h
+++ b/bson/bson.h
@@ -25,15 +25,42 @@ enum ElementType {
 	ElementType_MaxKey = 0x7F,
 };
 
+template <typename T>
+struct Document
+{
+	Document(T& writer)
+		:
+		w_(writer)
+	{
+		w_.EnterDocument();
+	}
+	~Document()
+	{
+		w_.LeaveDocument();
+	}
+private:
+	T& w_;
+};
+
 struct IReader {
-	const char* GetName() const;
-	ElementType GetType() const;
-	const char* GetDataPtr() const;
-	const char** GetCurrentPath() const;
+	const char* ReadElementName() const;
+	ElementType ReadElementType() const;
+	const char* ReadElementDataPtr() const;
+	
+	void ReadElement_Double(double& val) const;
+	void ReadElement_String(char* str, uint32_t& strLen) const;
+	void ReadElement_Binary(uint32_t& nBytes, BinarySubType& subType, char* data) const;
+	void ReadElement_Boolean(bool& val);
+	void ReadElement_Regex(char* pattern, char* option);
+	void ReadElement_Int32(int32_t& val);
+	void ReadElement_Int64(int64_t& val);
+	
+	const char** CurrentPath() const;
 	
-	bool ReadNextElement();
-	bool EnterDocument();
-	bool LeaveDocument();
+	bool MoveToNextElement();
+	
+	virtual bool EnterDocument() = 0;
+	virtual bool LeaveDocument() = 0;
 };
 
 enum BinarySubType {
@@ -56,43 +83,13 @@ struct IWriter {
 	void WriteElement_Regex(const char* name, const char* pattern, const char* option)	{	WriteElementHead(ElementType_Regex, name);		WriteCString(pattern);	WriteCString(option);	}
 	void WriteElement_Int32(const char* name, int32_t val)								{	WriteElementHead(ElementType_Int32, name);		WriteInt32(val);	}
 	void WriteElement_Int64(const char* name, int64_t val)								{	WriteElementHead(ElementType_Int64, name);		WriteInt64(val);	}
-	void WriteElement(const char* name, ElementType type, const char* data)				{
-		WriteElementHead(type, name);
-		size_t len;
-		switch (type) {
-		case ElementType_String:
-		case ElementType_JavaScriptCode:
-		case ElementType_Symbol:
-			break;
-		case ElementType_Document:
-			break;
-		case ElementType_Binary:
-			break;
-		case ElementType_Boolean:
-			len = 1;
-			break;
-		case ElementType_Null:
-			len = 0;
-			break;
-		case ElementType_Regex:
-			break;
-		case ElementType_Int32:
-			len = 4;
-			break;
-		case ElementType_Double:
-		case ElementType_UTCdatetime:
-		case ElementType_TimeStamp:
-		case ElementType_Int64:
-			len = 8;
-			break;
-		}
-		Write(data, len);
-	}
-	void EnterDocument();	// start writing document
-	void LeaveDocument();	
 	
+	virtual void EnterDocument() = 0;	// start writing document
+	virtual void LeaveDocument() = 0;	
+	
+private:
 	// device
-	void Write(const char* data, uint32_t len);
+	virtual void Write(const char* data, uint32_t len) = 0;
 	
 	// impl
 	void WriteElementHead(ElementType type, const char* name)							{	WriteInt8(type);	WriteCString(name);	}
@@ -107,11 +104,5 @@ struct IWriter {
 	
 };
 
-struct FileReader : IReader {
-	const char* name_;
-	ElementType type_;
-	std::vector<const char*> path_;
-};
-
 
 } // namespace BSON