Merged main.

1 files changed, 86 insertions, 0 deletions

diff --git a/zenstore/basicfile.cpp b/zenstore/basicfile.cpp
index 9ed70a5ec..80d9a2204 100644
--- a/zenstore/basicfile.cpp
+++ b/zenstore/basicfile.cpp
@@ -9,6 +9,14 @@
 #include <zencore/testing.h>
 #include <zencore/testutils.h>
 
+#if ZEN_PLATFORM_WINDOWS
+#	include <zencore/windows.h>
+#else
+#	include <fcntl.h>
+#	include <sys/file.h>
+#	include <sys/stat.h>
+#endif
+
 #include <fmt/format.h>
 #include <gsl/gsl-lite.hpp>
 
@@ -38,6 +46,7 @@ BasicFile::Open(std::filesystem::path FileName, bool IsCreate, std::error_code&
 {
 	Ec.clear();
 
+#if ZEN_PLATFORM_WINDOWS
 	const DWORD dwCreationDisposition = IsCreate ? CREATE_ALWAYS : OPEN_EXISTING;
 	DWORD		dwDesiredAccess		  = GENERIC_READ | GENERIC_WRITE;
 	const DWORD dwShareMode			  = FILE_SHARE_READ;
@@ -63,6 +72,19 @@ BasicFile::Open(std::filesystem::path FileName, bool IsCreate, std::error_code&
 
 		return;
 	}
+#else
+	int OpenFlags = O_RDWR;
+	OpenFlags |= IsCreate ? O_CREAT | O_TRUNC : 0;
+
+	int Fd = open(FileName.c_str(), OpenFlags, 0666);
+	if (Fd < 0)
+	{
+		Ec = zen::MakeErrorCodeFromLastError();
+		return;
+	}
+
+	void* FileHandle = (void*)(uintptr_t(Fd));
+#endif
 
 	m_FileHandle = FileHandle;
 }
@@ -72,7 +94,12 @@ BasicFile::Close()
 {
 	if (m_FileHandle)
 	{
+#if ZEN_PLATFORM_WINDOWS
 		::CloseHandle(m_FileHandle);
+#else
+		int Fd = int(uintptr_t(m_FileHandle));
+		close(Fd);
+#endif
 		m_FileHandle = nullptr;
 	}
 }
@@ -86,6 +113,7 @@ BasicFile::Read(void* Data, uint64_t BytesToRead, uint64_t FileOffset)
 	{
 		const uint64_t NumberOfBytesToRead = Min(BytesToRead, MaxChunkSize);
 
+#if ZEN_PLATFORM_WINDOWS
 		OVERLAPPED Ovl{};
 
 		Ovl.Offset	   = DWORD(FileOffset & 0xffff'ffffu);
@@ -95,6 +123,12 @@ BasicFile::Read(void* Data, uint64_t BytesToRead, uint64_t FileOffset)
 		BOOL  Success			  = ::ReadFile(m_FileHandle, Data, DWORD(NumberOfBytesToRead), &dwNumberOfBytesRead, &Ovl);
 
 		ZEN_ASSERT(dwNumberOfBytesRead == NumberOfBytesToRead);
+#else
+		static_assert(sizeof(off_t) >= sizeof(uint64_t), "sizeof(off_t) does not support large files");
+		int	 Fd		   = int(uintptr_t(m_FileHandle));
+		int	 BytesRead = pread(Fd, Data, NumberOfBytesToRead, FileOffset);
+		bool Success   = (BytesRead > 0);
+#endif
 
 		if (!Success)
 		{
@@ -161,6 +195,7 @@ BasicFile::Write(const void* Data, uint64_t Size, uint64_t FileOffset, std::erro
 	{
 		const uint64_t NumberOfBytesToWrite = Min(Size, MaxChunkSize);
 
+#if ZEN_PLATFORM_WINDOWS
 		OVERLAPPED Ovl{};
 
 		Ovl.Offset	   = DWORD(FileOffset & 0xffff'ffffu);
@@ -169,6 +204,12 @@ BasicFile::Write(const void* Data, uint64_t Size, uint64_t FileOffset, std::erro
 		DWORD dwNumberOfBytesWritten = 0;
 
 		BOOL Success = ::WriteFile(m_FileHandle, Data, DWORD(NumberOfBytesToWrite), &dwNumberOfBytesWritten, &Ovl);
+#else
+		static_assert(sizeof(off_t) >= sizeof(uint64_t), "sizeof(off_t) does not support large files");
+		int	 Fd			  = int(uintptr_t(m_FileHandle));
+		int	 BytesWritten = pwrite(Fd, Data, NumberOfBytesToWrite, FileOffset);
+		bool Success	  = (BytesWritten > 0);
+#endif
 
 		if (!Success)
 		{
@@ -210,16 +251,29 @@ BasicFile::WriteAll(IoBuffer Data, std::error_code& Ec)
 void
 BasicFile::Flush()
 {
+#if ZEN_PLATFORM_WINDOWS
 	FlushFileBuffers(m_FileHandle);
+#else
+	int Fd = int(uintptr_t(m_FileHandle));
+	fsync(Fd);
+#endif
 }
 
 uint64_t
 BasicFile::FileSize()
 {
+#if ZEN_PLATFORM_WINDOWS
 	ULARGE_INTEGER liFileSize;
 	liFileSize.LowPart = ::GetFileSize(m_FileHandle, &liFileSize.HighPart);
 
 	return uint64_t(liFileSize.QuadPart);
+#else
+	int Fd = int(uintptr_t(m_FileHandle));
+	static_assert(sizeof(decltype(stat::st_size)) == sizeof(uint64_t), "fstat() doesn't support large files");
+	struct stat Stat;
+	fstat(Fd, &Stat);
+	return uint64_t(Stat.st_size);
+#endif
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -234,11 +288,16 @@ TemporaryFile::Close()
 {
 	if (m_FileHandle)
 	{
+#if ZEN_PLATFORM_WINDOWS
 		// Mark file for deletion when final handle is closed
 
 		FILE_DISPOSITION_INFO Fdi{.DeleteFile = TRUE};
 
 		SetFileInformationByHandle(m_FileHandle, FileDispositionInfo, &Fdi, sizeof Fdi);
+#else
+		std::filesystem::path FilePath = zen::PathFromHandle(m_FileHandle);
+		unlink(FilePath.c_str());
+#endif
 
 		BasicFile::Close();
 	}
@@ -275,11 +334,18 @@ LockFile::LockFile()
 
 LockFile::~LockFile()
 {
+#if ZEN_PLATFORM_LINUX
+	int Fd = int(intptr_t(m_FileHandle));
+	flock(Fd, LOCK_UN | LOCK_NB);
+#elif ZEN_PLATFORM_MAC
+#	error check flock() support
+#endif
 }
 
 void
 LockFile::Create(std::filesystem::path FileName, CbObject Payload, std::error_code& Ec)
 {
+#if ZEN_PLATFORM_WINDOWS
 	Ec.clear();
 
 	const DWORD dwCreationDisposition = CREATE_ALWAYS;
@@ -302,6 +368,26 @@ LockFile::Create(std::filesystem::path FileName, CbObject Payload, std::error_co
 
 		return;
 	}
+#elif ZEN_PLATFORM_LINUX
+	int Fd = open(FileName.c_str(), O_RDWR | O_CREAT, 0666);
+	if (Fd < 0)
+	{
+		Ec = zen::MakeErrorCodeFromLastError();
+		return;
+	}
+
+	int LockRet = flock(Fd, LOCK_EX | LOCK_NB);
+	if (LockRet < 0)
+	{
+		Ec = zen::MakeErrorCodeFromLastError();
+		close(Fd);
+		return;
+	}
+
+	void* FileHandle = (void*)uintptr_t(Fd);
+#else
+#	error check flock() support
+#endif
 
 	m_FileHandle = FileHandle;