pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-10 16:12:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmf wont lock - programmer can handle that

Browse Source
This commit is contained in:
KimLS 2013-02-23 00:48:16 -08:00
parent 39a77a855e
commit 54883b0795
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/memory_mapped_file.cpp
View File

@ -29,7 +29,6 @@
#include <stdio.h> #include <stdio.h>
#endif #endif
#include "eqemu_exception.h" #include "eqemu_exception.h"
#include "ipc_mutex.h"
namespace EQEmu { namespace EQEmu {
@ -44,11 +43,6 @@ namespace EQEmu {
MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size) MemoryMappedFile::MemoryMappedFile(std::string filename, uint32 size)
: filename_(filename), size_(size) { : filename_(filename), size_(size) {
imp_ = new Implementation; imp_ = new Implementation;
IPCMutex mut(filename + "Internal");
if(!mut.Lock()) {
EQ_EXCEPT("Shared Memory", "Could not lock shared mutex.");
}
#ifdef _WINDOWS #ifdef _WINDOWS
DWORD total_size = size + sizeof(shared_memory_struct); DWORD total_size = size + sizeof(shared_memory_struct);
@ -72,7 +66,6 @@ namespace EQEmu {
filename.c_str()); filename.c_str());
if(!imp_->mapped_object_) { if(!imp_->mapped_object_) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file.");
} }
@ -83,7 +76,6 @@ namespace EQEmu {
total_size)); total_size));
if(!memory_) { if(!memory_) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file.");
} }
@ -91,7 +83,6 @@ namespace EQEmu {
size_t total_size = size + sizeof(shared_memory_struct); size_t total_size = size + sizeof(shared_memory_struct);
imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
if(imp_->fd_ == -1) { if(imp_->fd_ == -1) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment.");
} }
@ -103,21 +94,14 @@ namespace EQEmu {
mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0));
if(memory_ == MAP_FAILED) { if(memory_ == MAP_FAILED) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file.");
} }
#endif #endif
mut.Unlock();
} }
MemoryMappedFile::MemoryMappedFile(std::string filename) MemoryMappedFile::MemoryMappedFile(std::string filename)
: filename_(filename) { : filename_(filename) {
imp_ = new Implementation; imp_ = new Implementation;
IPCMutex mut(filename + "Internal");
if(!mut.Lock()) {
EQ_EXCEPT("Shared Memory", "Could not lock shared mutex.");
}
//get existing size //get existing size
FILE *f = fopen(filename.c_str(), "rb"); FILE *f = fopen(filename.c_str(), "rb");
@ -150,7 +134,6 @@ namespace EQEmu {
filename.c_str()); filename.c_str());
if(!imp_->mapped_object_) { if(!imp_->mapped_object_) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file.");
} }
@ -161,7 +144,6 @@ namespace EQEmu {
total_size)); total_size));
if(!memory_) { if(!memory_) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file."); EQ_EXCEPT("Shared Memory", "Could not map a view of the shared memory file.");
} }
@ -169,7 +151,6 @@ namespace EQEmu {
size_t total_size = size + sizeof(shared_memory_struct); size_t total_size = size + sizeof(shared_memory_struct);
imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); imp_->fd_ = open(filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
if(imp_->fd_ == -1) { if(imp_->fd_ == -1) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment."); EQ_EXCEPT("Shared Memory", "Could not open a file for this shared memory segment.");
} }
@ -181,11 +162,9 @@ namespace EQEmu {
mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0)); mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, imp_->fd_, 0));
if(memory_ == MAP_FAILED) { if(memory_ == MAP_FAILED) {
mut.Unlock();
EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file."); EQ_EXCEPT("Shared Memory", "Could not create a file mapping for this shared memory file.");
} }
#endif #endif
mut.Unlock();
} }
MemoryMappedFile::~MemoryMappedFile() { MemoryMappedFile::~MemoryMappedFile() {