github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: FileStream NOWRITESHARE implemented for Linux,BSD using flock

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@4641 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-03-02 12:51:32 +00:00
parent 6ade22475d
commit 7a3af47051
3 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uppsrc/Core/BlockStream.cpp
View file

@ -473,6 +473,11 @@ bool FileStream::Open(const char *name, dword mode, mode_t tmode) {
O_RDWR|O_CREAT,
tmode);
if(handle >= 0) {
if((mode & NOWRITESHARE) && flock(handle, LOCK_EX|LOCK_NB) < 0) {
close(handle);
handle = -1;
return false;
}
int64 fsz = LSEEK64_(handle, 0, SEEK_END);
if(fsz >= 0) {
OpenInit(mode, fsz);
@ -508,6 +513,20 @@ FileStream::~FileStream() {
Close();
}
#ifdef PLATFORM_POSIX
bool FileOut::Open(const char *fn, mode_t acm)
{
return FileStream::Open(fn, FileStream::CREATE|FileStream::NOWRITESHARE, acm);
}
#endif
#ifdef PLATFORM_WIN32
bool FileOut::Open(const char *fn)
{
return FileStream::Open(fn, FileStream::CREATE|FileStream::NOWRITESHARE);
}
#endif
#endif
END_UPP_NAMESPACE

1
uppsrc/Core/Core.h
View file

@ -60,6 +60,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/file.h>
#include <time.h>
#include <fcntl.h>
#include <unistd.h>

6
uppsrc/Core/Stream.h
View file

@ -418,14 +418,12 @@ public:
class FileOut : public FileStream {
public:
#ifdef PLATFORM_POSIX
bool Open(const char *fn, mode_t acm = 0644)
{ return FileStream::Open(fn, FileStream::CREATE, acm); }
bool Open(const char *fn, mode_t acm = 0644);
#endif
#ifdef PLATFORM_WIN32
bool Open(const char *fn) { return FileStream::Open(fn, FileStream::CREATE|FileStream::NOWRITESHARE); }
bool Open(const char *fn);
#endif
FileOut(const char *fn) { Open(fn); }
FileOut() {}
};