hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-08-21 11:43:15 +02:00
commit 413186cd64
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/shared_memory.cpp
View file

@ -349,6 +349,8 @@ namespace IPC {
close(); close();
} }
#ifdef SHM_ENABLED
/// Returns true if the open file still exists. /// Returns true if the open file still exists.
/// \TODO Not implemented under Windows. /// \TODO Not implemented under Windows.
bool sharedPage::exists(){ bool sharedPage::exists(){
@ -365,7 +367,6 @@ namespace IPC {
#endif #endif
} }
#ifdef SHM_ENABLED
///\brief Unmaps a shared page if allowed ///\brief Unmaps a shared page if allowed
void sharedPage::unmap() { void sharedPage::unmap() {
if (mapped && len) { if (mapped && len) {
@ -562,6 +563,13 @@ namespace IPC {
} }
} }
/// Returns true if the open file still exists.
bool sharedFile::exists(){
struct stat sb;
if (fstat(handle, &sb)){return false;}
return (sb.st_nlink > 0);
}
///\brief Initialize a page, de-initialize before if needed ///\brief Initialize a page, de-initialize before if needed
///\param name_ The name of the page to be created ///\param name_ The name of the page to be created
///\param len_ The size to make the page ///\param len_ The size to make the page

2
lib/shared_memory.h
View file

@ -110,9 +110,9 @@ namespace IPC {
bool operator < (const sharedFile & rhs) const { bool operator < (const sharedFile & rhs) const {
return name < rhs.name; return name < rhs.name;
} }
bool exists(){return true;}
void close(); void close();
void unmap(); void unmap();
bool exists();
///\brief The fd handle of the opened shared file ///\brief The fd handle of the opened shared file
int handle; int handle;
///\brief The name of the opened shared file ///\brief The name of the opened shared file